Fixes for strict_aliasing

Change-Id: If8486318bf9610c6ecc93678d2ed3c52c82ca327
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>