Fix ups for rendering coming