Post grammar changes