Some more grammar changes