More grammar changes