More Fix Strict Aliasing