Adding in fixes for rendering