Patch some bad errors/warnings