Render fix and small scene fix