Fixes for rendering