Reduced more compiler errors