Few small bug fixes found during initial tests
Merge branch 'master' of github.com:marcgreen/p2pbackup