Fixing compiler bugs...