Almost done fixing compile errors