Aliasing fixes.