Missed even more rendering fixes in last commit