Renderator fixes, pull focus