diff --git a/src/fs/fat16.cpp b/src/fs/fat16.cpp
index d01678b..0c432f3 100644
--- a/src/fs/fat16.cpp
+++ b/src/fs/fat16.cpp
@@ -106,6 +106,7 @@ qint64 fat16::readUsedCapacity(const QString& deviceNode) const
 {
     ExternalCommand cmd(QStringLiteral("fsck.msdos"), { QStringLiteral("-n"), QStringLiteral("-v"), deviceNode });
 
+    // Exit code 1 is returned when FAT dirty bit is set
     if (cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1)) {
         qint64 usedClusters = -1;
         QRegularExpression re(QStringLiteral("files, (\\d+)/\\d+ "));
diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index 32c4c28..75f7477 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -58,7 +58,9 @@ luks::luks(qint64 firstsector,
     : FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Luks)
     , m_innerFs(nullptr)
     , m_isCryptOpen(false)
+    , m_cryptsetupFound(false)
     , m_isMounted(false)
+    , m_logicalSectorSize(1)
 {
 }
 
@@ -131,11 +133,7 @@ bool luks::create(Report& report, const QString& deviceNode) const
     if (!m_innerFs->create(report, mapperNode))
         return false;
 
-    m_isCryptOpen = (m_innerFs != nullptr);
-
-    if (m_isCryptOpen)
-        return true;
-    return false;
+    return true;
 }
 
 QString luks::mountTitle() const
@@ -249,9 +247,7 @@ bool luks::cryptOpen(QWidget* parent, const QString& deviceNode)
     if (!( openCmd.start(-1) &&
                     openCmd.write(passphrase.toUtf8() + '\n') == passphrase.toUtf8().length() + 1 &&
                     openCmd.waitFor() && openCmd.exitCode() == 0) )
-    {
         return false;
-    }
 
     if (m_innerFs)
     {
@@ -266,12 +262,11 @@ bool luks::cryptOpen(QWidget* parent, const QString& deviceNode)
     loadInnerFileSystem(deviceNode, mapperNode);
     m_isCryptOpen = (m_innerFs != nullptr);
 
-    if (m_isCryptOpen)
-    {
-        m_passphrase = passphrase;
-        return true;
-    }
-    return false;
+    if (!m_isCryptOpen)
+        return false;
+
+    m_passphrase = passphrase;
+    return true;
 }
 
 bool luks::cryptClose(const QString& deviceNode)
@@ -305,9 +300,9 @@ bool luks::cryptClose(const QString& deviceNode)
 
     m_isCryptOpen = (m_innerFs != nullptr);
 
-    if (!m_isCryptOpen)
-        return true;
-    return false;
+    if (m_isCryptOpen)
+        return false;
+    return true;
 }
 
 void luks::loadInnerFileSystem(const QString& deviceNode, const QString& mapperNode)
diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp
index 95ac69d..b7751db 100644
--- a/src/plugins/libparted/libpartedbackend.cpp
+++ b/src/plugins/libparted/libpartedbackend.cpp
@@ -243,7 +243,7 @@ Device* LibPartedBackend::scanDevice(const QString& deviceNode)
         bool mounted = false;
         if (fsType == FileSystem::Luks) {
             r |= PartitionRole::Luks;
-            FS::luks* luksFs = dynamic_cast<FS::luks*>(fs);
+            FS::luks* luksFs = static_cast<FS::luks*>(fs);
             QString mapperNode = FS::luks::mapperName(partitionNode);
             bool isCryptOpen = !mapperNode.isEmpty();
             luksFs->setCryptOpen(isCryptOpen);