Smaller grammar fixes