autoscan - minor fixes
Merge pull request #780 from andrzej-jankowski/autoscan

autoscan - minor fixes