Removed a few more inconsistancies