0.3.9 - tweaks associated with adding lazy load to 0.3.8