little fixes

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'jmeprototype' of github.com:gormed/drunken-nemesis into jmeprototype
Merge branch 'hady' into jmeprototype