Fixed aliasing violations