Aliasing Fixes: Part 1.