Grammar and RM fixes