Pixel pushing perf work, fixes