More Grammar Bug fixes