Finish removing compile errors