7.x grammar fix fixes