Tweaks to rendering and ticking order