Further bug fixes on Load