Rendering fixes

Small changes to the renderer to make our lives easier