Resolved all compile errors for the moment