Beginning of grammar fixes