diff --git a/client/CDoc2.cpp b/client/CDoc2.cpp
index 3c637ee0c..7b0bfa5eb 100644
--- a/client/CDoc2.cpp
+++ b/client/CDoc2.cpp
@@ -563,7 +563,7 @@ bool CDoc2::save(const QString &path)
 			return setLastError(QStringLiteral("No valid config found for keyserver_id: %1").arg(key.keyserver_id));
 		if(!cdoc20::checkConnection())
 			return false;
-		QScopedPointer<QNetworkAccessManager,QScopedPointerDeleteLater> nam(CheckConnection::setupNAM(req, Settings::CDOC2_GET_CERT));
+		QScopedPointer<QNetworkAccessManager,QScopedPointerDeleteLater> nam(CheckConnection::setupNAM(req, Settings::CDOC2_POST_CERT));
 		QEventLoop e;
 		QNetworkReply *reply = nam->post(req, QJsonDocument({
 			{QLatin1String("recipient_id"), QLatin1String(recipient_id.toBase64())},
@@ -717,7 +717,7 @@ QByteArray CDoc2::transportKey(const CKey &_key)
 			return {};
 		auto authKey = dispatchToMain(&QSigner::key, qApp->signer());
 		QScopedPointer<QNetworkAccessManager,QScopedPointerDeleteLater> nam(
-			CheckConnection::setupNAM(req, qApp->signer()->tokenauth().cert(), authKey, Settings::CDOC2_POST_CERT));
+			CheckConnection::setupNAM(req, qApp->signer()->tokenauth().cert(), authKey, Settings::CDOC2_GET_CERT));
 		QEventLoop e;
 		QNetworkReply *reply = nam->get(req);
 		connect(reply, &QNetworkReply::finished, &e, &QEventLoop::quit);
diff --git a/client/CryptoDoc.cpp b/client/CryptoDoc.cpp
index 1b5ad7754..6608e209c 100644
--- a/client/CryptoDoc.cpp
+++ b/client/CryptoDoc.cpp
@@ -392,15 +392,6 @@ QList<CKey> CryptoDoc::keys() const
 	return d->cdoc->keys;
 }
 
-QList<QString> CryptoDoc::files()
-{
-	QList<QString> fileList;
-	fileList.reserve(d->cdoc->files.size());
-	for(const CDoc::File &f: qAsConst(d->cdoc->files))
-		fileList.append(f.name);
-	return fileList;
-}
-
 bool CryptoDoc::move(const QString &to)
 {
 	if(!d->isEncrypted)
diff --git a/client/CryptoDoc.h b/client/CryptoDoc.h
index c759dde6d..8929550ed 100644
--- a/client/CryptoDoc.h
+++ b/client/CryptoDoc.h
@@ -33,7 +33,7 @@ class CKey
 {
 public:
 	CKey() = default;
-	CKey(const QByteArray &_key, bool _isRSA): key(_key), isRSA(_isRSA) {}
+	CKey(QByteArray _key, bool _isRSA): key(std::move(_key)), isRSA(_isRSA) {}
 	CKey(const QSslCertificate &cert);
 	bool operator==(const CKey &other) const { return other.key == key; }
 
@@ -90,7 +90,6 @@ class CryptoDoc final: public QObject
 	DocumentModel* documentModel() const;
 	bool encrypt(const QString &filename = {});
 	QString fileName() const;
-	QList<QString> files();
 	QList<CKey> keys() const;
 	bool move(const QString &to);
 	bool open( const QString &file );
@@ -114,13 +113,11 @@ class CDocumentModel final: public DocumentModel
 	QString data(int row) const final;
 	quint64 fileSize(int row) const final;
 	QString mime(int row) const final;
+	void open(int row) final;
 	bool removeRow(int row) final;
 	int rowCount() const final;
 	QString save(int row, const QString &path) const final;
 
-public slots:
-	void open(int row) final;
-
 private:
 	CDocumentModel(CryptoDoc::Private *doc);
 	Q_DISABLE_COPY(CDocumentModel)
diff --git a/client/DigiDoc.h b/client/DigiDoc.h
index 7082de1bc..92941c825 100644
--- a/client/DigiDoc.h
+++ b/client/DigiDoc.h
@@ -97,13 +97,11 @@ class SDocumentModel final: public DocumentModel
 	QString data(int row) const final;
 	quint64 fileSize(int row) const final;
 	QString mime(int row) const final;
+	void open(int row) final;
 	bool removeRow(int row) final;
 	int rowCount() const final;
 	QString save(int row, const QString &path) const final;
 
-public slots:
-	void open(int row) override;
-
 private:
 	SDocumentModel(DigiDoc *container);
 	Q_DISABLE_COPY(SDocumentModel)