Start fixing compile errors