Further fixes aliasing