Fix lazy-load bugs
Merge branch '1.0.7' of github.com:DeegC/zeidon-joe into 1.0.7