various fixes related to https://github.com/globaleaks/GlobaLeaks/issues/740