Resolve the rest of compile errors/warnings