Fixed left recursion issues