More fixes for "strict aliasing rules"