Grammer fixes