Aliasing fixes