More grammar modifications