more aliasing fixes..