Fixed grammar constraints