More fixes to rendering code that should have been committed last week.