More Grammar Fixes