More logistics bugfixes
Merge branch 'master' of github.com:LitusProject/Litus
So, that last commit was not a bug fix