Some tweaks for rendering