Grammar and inconsistency fixes