Fix aliasing violations (properly)