diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h
index d17852b63..cc9716123 100644
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -64,10 +64,10 @@ namespace Choices
         quint64 requiredSpaceB;  // estimated required space for root partition
         SwapChoice swap;
 
-        AutoPartitionOptions( const QString& fs, const QString& luks, const QString& efi, qint64 r, SwapChoice s )
+        AutoPartitionOptions( const QString& fs, const QString& luks, const QString& efi, qint64 requiredBytes, SwapChoice s )
             : ReplacePartitionOptions( fs, luks )
             , efiPartitionMountPoint( efi )
-            , requiredSpaceB( r > 0 ? r : 0 )
+            , requiredSpaceB( requiredBytes > 0 ? static_cast<quint64>( requiredBytes ) : 0 )
             , swap( s )
         {
         }
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 36a61d088..963a6ceb1 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -60,8 +60,8 @@ PartitionLayout::PartitionLayout( PartitionLayout::PartitionEntry entry )
 }
 
 PartitionLayout::PartitionLayout( const PartitionLayout& layout )
-    : m_partLayout( layout.m_partLayout )
-    , m_defaultFsType( layout.m_defaultFsType )
+    : m_defaultFsType( layout.m_defaultFsType )
+    , m_partLayout( layout.m_partLayout )
 {
 }
 
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index fd6075ba0..cc7478226 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -51,7 +51,7 @@ public:
         PartUtils::SizeUnit partMaxSizeUnit = PartUtils::SizeUnit::Percent;
 
         /// @brief All-zeroes PartitionEntry
-        PartitionEntry() {};
+        PartitionEntry() {}
         /// @brief Parse @p size, @p min and @p max to their respective member variables
         PartitionEntry( const QString& size, const QString& min, const QString& max );
     };
diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp
index 8f0ecba81..0515184b5 100644
--- a/src/modules/partition/core/PartitionModel.cpp
+++ b/src/modules/partition/core/PartitionModel.cpp
@@ -65,7 +65,7 @@ PartitionModel::init( Device* device , const OsproberEntryList& osproberEntries
 }
 
 int
-PartitionModel::columnCount( const QModelIndex& parent ) const
+PartitionModel::columnCount( const QModelIndex& ) const
 {
     return ColumnCount;
 }
@@ -247,7 +247,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
 }
 
 QVariant
-PartitionModel::headerData( int section, Qt::Orientation orientation, int role ) const
+PartitionModel::headerData( int section, Qt::Orientation, int role ) const
 {
     if ( role != Qt::DisplayRole )
         return QVariant();