Fix aliasing violations

Change-Id: I282505d239f8db1e2bb494fbba1b35fc143b61f6