More render cleanups