Some other grammar fixes