Improvements to rendering