Tweaks to get sb-simd 1.3 to compile