Fix aliasing violations?