Removed all compile errors