Few fixes to Render