Paper: even more fixes
Merge branch 'master' of github.com:marcgreen/p2pbackup