Fixes with aliasing