Fixing compiler errors