Bugfixes for HerLoop