diff --git a/libs/image/kis_image.cc b/libs/image/kis_image.cc
index cf0c812..5c975c5 100644
--- a/libs/image/kis_image.cc
+++ b/libs/image/kis_image.cc
@@ -1712,10 +1712,7 @@ void KisImage::setProofingConfiguration(KisProofingConfigurationSP proofingConfi
 
 KisProofingConfigurationSP KisImage::proofingConfiguration() const
 {
-    if (m_d->proofingConfig) {
-        return m_d->proofingConfig;
-    }
-    return 0;
+    return m_d->proofingConfig;
 }
 
 QPointF KisImage::mirrorAxesCenter() const
diff --git a/libs/ui/canvas/kis_canvas2.cpp b/libs/ui/canvas/kis_canvas2.cpp
index ed54646..4de130f 100644
--- a/libs/ui/canvas/kis_canvas2.cpp
+++ b/libs/ui/canvas/kis_canvas2.cpp
@@ -610,7 +610,7 @@ void KisCanvas2::setProofingOptions(bool softProof, bool gamutCheck)
         m_d->proofingConfig = cfg.defaultProofingconfiguration();
     }
     KoColorConversionTransformation::ConversionFlags conversionFlags = m_d->proofingConfig->conversionFlags;
-#if QT_VERSION >= 0x07000
+#if QT_VERSION >= 0x070000
     if (this->image()->colorSpace()->colorDepthId().id().contains("U")) {
         conversionFlags.setFlag(KoColorConversionTransformation::SoftProofing, softProof);
         if (softProof) {
@@ -628,7 +628,7 @@ void KisCanvas2::setProofingOptions(bool softProof, bool gamutCheck)
     } else {
         conversionFlags = conversionFlags & ~KoColorConversionTransformation::GamutCheck;
     }
-#endif;
+#endif
     m_d->proofingConfig->conversionFlags = conversionFlags;
 
     m_d->proofingConfigUpdated = true;
diff --git a/libs/ui/dialogs/kis_dlg_image_properties.cc b/libs/ui/dialogs/kis_dlg_image_properties.cc
index 16f8eb7..b218a48 100644
--- a/libs/ui/dialogs/kis_dlg_image_properties.cc
+++ b/libs/ui/dialogs/kis_dlg_image_properties.cc
@@ -164,10 +164,10 @@ void KisDlgImageProperties::setProofingConfig()
     if (m_page->chkSaveProofing->isChecked()) {
 
         m_proofingConfig->conversionFlags = KoColorConversionTransformation::HighQuality;
-#if QT_VERSION >= 0x07000
+#if QT_VERSION >= 0x070000
         m_proofingConfig->conversionFlags.setFlag(KoColorConversionTransformation::BlackpointCompensation, m_page->ckbBlackPointComp->isChecked());
 #else
-        m_page->chkBlackPointComp->isChecked() ?
+        m_page->ckbBlackPointComp->isChecked() ?
             m_proofingConfig->conversionFlags |= KoColorConversionTransformation::BlackpointCompensation
             : m_proofingConfig->conversionFlags = m_proofingConfig->conversionFlags & ~KoColorConversionTransformation::BlackpointCompensation;
 
@@ -182,7 +182,7 @@ void KisDlgImageProperties::setProofingConfig()
         m_image->setProofingConfiguration(m_proofingConfig);
     }
     else {
-        m_image->setProofingConfiguration(0);
+        m_image->setProofingConfiguration(KisProofingConfigurationSP());
     }
 }