Fix aliasing violetions