Cleaning up more inconsistancies