7.x grammar fixes