Finished fixing compile errors