Merge "fastssim: Add some missing consts"