renderer fixes backported from newClient

@lennartcl