More fixes to permit build with strict aliasing

Change-Id: If09ab1a882df4a51553676be52f1ca132a3784c8