Style fix, strict aliasing violation fixes