Added a couple of things for rendering and loading resources correctly