Some small tweaks
Merge branch 'timewarp_pixels' into peppie23