diff --git a/src/modules/partition/DeviceModel.h b/src/modules/partition/DeviceModel.h
index 912e2e600..43c2914af 100644
--- a/src/modules/partition/DeviceModel.h
+++ b/src/modules/partition/DeviceModel.h
@@ -40,8 +40,8 @@ public:
      */
     void init( const QList< Device* >& devices );
 
-    int rowCount( const QModelIndex& parent = QModelIndex() ) const Q_DECL_OVERRIDE;
-    QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
+    int rowCount( const QModelIndex& parent = QModelIndex() ) const override;
+    QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override;
 
     Device* deviceForIndex( const QModelIndex& index ) const;
 
diff --git a/src/modules/partition/PartitionModel.h b/src/modules/partition/PartitionModel.h
index 8fea36f9b..9159d2b7e 100644
--- a/src/modules/partition/PartitionModel.h
+++ b/src/modules/partition/PartitionModel.h
@@ -74,7 +74,7 @@ public:
         FileSystemColumn,
         MountPointColumn,
         SizeColumn,
-        ColumnCount = SizeColumn + 1
+        ColumnCount // Must remain last
     };
 
     PartitionModel( QObject* parent = 0 );
diff --git a/src/modules/partition/PartitionPage.h b/src/modules/partition/PartitionPage.h
index 86263f096..652c075b5 100644
--- a/src/modules/partition/PartitionPage.h
+++ b/src/modules/partition/PartitionPage.h
@@ -42,10 +42,6 @@ public:
     explicit PartitionPage( PartitionCoreModule* core, QWidget* parent = 0 );
     ~PartitionPage();
 
-Q_SIGNALS:
-
-public Q_SLOTS:
-
 private:
     QScopedPointer< Ui_PartitionPage > m_ui;
     PartitionCoreModule* m_core;
diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index f9ebabbe5..2d21ef53e 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -31,7 +31,7 @@
 PartitionViewStep::PartitionViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_core( new PartitionCoreModule( this ) )
-    , m_widget( new PartitionPage( m_core ) )
+    , m_page( new PartitionPage( m_core ) )
 {
     connect( m_core, SIGNAL( hasRootMountPointChanged( bool ) ),
              SIGNAL( nextStatusChanged( bool ) ) );
@@ -48,7 +48,7 @@ PartitionViewStep::prettyName() const
 QWidget*
 PartitionViewStep::widget()
 {
-    return m_widget;
+    return m_page;
 }
 
 
diff --git a/src/modules/partition/PartitionViewStep.h b/src/modules/partition/PartitionViewStep.h
index ea1a8f3f0..9e1eae808 100644
--- a/src/modules/partition/PartitionViewStep.h
+++ b/src/modules/partition/PartitionViewStep.h
@@ -57,7 +57,7 @@ public:
 
 private:
     PartitionCoreModule* m_core;
-    PartitionPage* m_widget;
+    PartitionPage* m_page;
 };
 
 #endif // PARTITIONVIEWSTEP_H