Fixed a couple of small things on load.