Small grammar updates