Fixes to grammary