Some grammar changes