random fixes for the loop handling
Merge pull request #99 from os-autoinst/coolo_fixes

random fixes for the loop handling