Small grammar tweaks