Minor simd fixes and amendments