Fix Aliasing errors with strict compiling

Change-Id: I5fbbf042017456b48a3a3f8c31d8a36d81d2ce9d