Fixed preparser issues