Fixed bugs in grammar found with grun