Fixed all remaining compile errors