All compile errors fixed