Fixing compiler problems