Updates to load without error - Thanks to LK for pointing out what needed to have fixes.