Fix aliasing stuff

Change-Id: I4395217b0fe4bfe6b9b9439c3de29bb945df84d6