Fixes to rendering