Config grammar fixes