Grammar and related fixes