Fix Render Issues