Flicker parser part 1 fixes