Render fixes & Intergration fixes