Render Map Fixes