Fixed constant/variable errors