few tweak to make start up works
Merge branch 'keesspoelstra-botbanger-hitmiss2' of github.com:/equalitie/banjax into keesspoelstra-botbanger-hitmiss2
Merging vmon's minor changes with Kees during last two weeks