Reduced compilation errors