Fix aliasing mistakes