diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/abstr/AbstractOpenPgpKeyStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/abstr/AbstractOpenPgpKeyStore.java
index 44711b994..4e8f25f98 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/abstr/AbstractOpenPgpKeyStore.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/abstr/AbstractOpenPgpKeyStore.java
@@ -157,6 +157,7 @@ public abstract class AbstractOpenPgpKeyStore implements OpenPgpKeyStore {
     public void importSecretKey(BareJid owner, PGPSecretKeyRing secretKeys)
             throws IOException, PGPException, MissingUserIdOnKeyException {
 
+        // TODO: Avoid 'new' use instance method.
         if (!new BareJidUserId.SecRingSelectionStrategy().accept(owner, secretKeys)) {
             throw new MissingUserIdOnKeyException(owner, new OpenPgpV4Fingerprint(secretKeys));
         }
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java
index 2e0409166..b64a89645 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java
@@ -36,6 +36,7 @@ public class FileBasedOpenPgpStore extends AbstractOpenPgpStore {
     }
 
     public static File getContactsPath(File basePath, BareJid jid) {
+        // TODO: This is not filesystem agnostic, the jid should be base32 encoded.
         return new File(basePath, Objects.requireNonNull(jid.toString()));
     }