Fixes for Grammar