Started fixing compiler