Fixed more compiler bugs