Small grammar changes