diff --git a/src/core/fieldformatter/qgsrelationreferencefieldformatter.cpp b/src/core/fieldformatter/qgsrelationreferencefieldformatter.cpp
index 6ba78591332..e648b39aa1a 100644
--- a/src/core/fieldformatter/qgsrelationreferencefieldformatter.cpp
+++ b/src/core/fieldformatter/qgsrelationreferencefieldformatter.cpp
@@ -184,11 +184,11 @@ QList<QVariant> QgsRelationReferenceFieldFormatter::availableValues( const QVari
 {
   QList<QVariant> values;
 
-  QgsVectorLayer *referencedLayer = QgsProject::instance()->relationManager()->relation( config[QStringLiteral( "Relation" )].toString() ).referencedLayer();
+  const QgsVectorLayer *referencedLayer = QgsProject::instance()->relationManager()->relation( config[QStringLiteral( "Relation" )].toString() ).referencedLayer();
   if ( referencedLayer )
   {
-    int layerFieldIndex =  QgsProject::instance()->relationManager()->relation( config[QStringLiteral( "Relation" )].toString() ).referencedFields().first();
-    values = referencedLayer->uniqueValues( layerFieldIndex, countLimit ).toList();
+    int fieldIndex =  QgsProject::instance()->relationManager()->relation( config[QStringLiteral( "Relation" )].toString() ).referencedFields().first();
+    values = referencedLayer->uniqueValues( fieldIndex, countLimit ).toList();
   }
   return values;
 }
diff --git a/src/core/fieldformatter/qgsvaluemapfieldformatter.cpp b/src/core/fieldformatter/qgsvaluemapfieldformatter.cpp
index 3008ac35f1c..4d37993469e 100644
--- a/src/core/fieldformatter/qgsvaluemapfieldformatter.cpp
+++ b/src/core/fieldformatter/qgsvaluemapfieldformatter.cpp
@@ -71,7 +71,7 @@ QVariant QgsValueMapFieldFormatter::sortValue( QgsVectorLayer *layer, int fieldI
 QList<QVariant> QgsValueMapFieldFormatter::availableValues( const QVariantMap &config, int countLimit ) const
 {
   QList<QVariant> values;
-  QList<QVariant> valueList = config.value( QStringLiteral( "map" ) ).toList();
+  const QList<QVariant> valueList = config.value( QStringLiteral( "map" ) ).toList();
   for ( const QVariant &item : valueList )
   {
     values.append( item.toMap().constBegin().value() );