Cleaning compilation errors