diff --git a/python/core/auto_generated/qgseditformconfig.sip.in b/python/core/auto_generated/qgseditformconfig.sip.in
index 7fe7a8681c1..580441ee18a 100644
--- a/python/core/auto_generated/qgseditformconfig.sip.in
+++ b/python/core/auto_generated/qgseditformconfig.sip.in
@@ -264,7 +264,7 @@ Write XML information
 Serialize on project save
 %End
 
-    QgsAttributeEditorElement *attributeEditorElementFromDomElement( QDomElement &elem, QgsAttributeEditorElement *parent, const QString &layerId = 0 );
+    QgsAttributeEditorElement *attributeEditorElementFromDomElement( QDomElement &elem, QgsAttributeEditorElement *parent, const QString &layerId = QString() );
 %Docstring
 Deserialize drag and drop designer elements.
 %End
diff --git a/src/core/qgseditformconfig.h b/src/core/qgseditformconfig.h
index 6143201e1a1..6c790554c7d 100644
--- a/src/core/qgseditformconfig.h
+++ b/src/core/qgseditformconfig.h
@@ -288,7 +288,7 @@ class CORE_EXPORT QgsEditFormConfig
     /**
      * Deserialize drag and drop designer elements.
      */
-    QgsAttributeEditorElement *attributeEditorElementFromDomElement( QDomElement &elem, QgsAttributeEditorElement *parent, const QString &layerId = nullptr );
+    QgsAttributeEditorElement *attributeEditorElementFromDomElement( QDomElement &elem, QgsAttributeEditorElement *parent, const QString &layerId = QString() );
 
     /**
      * Create a new edit form config. Normally invoked by QgsVectorLayer
diff --git a/src/core/qgstranslationcontext.cpp b/src/core/qgstranslationcontext.cpp
index 4e98848be5e..8ea3ee3da5f 100644
--- a/src/core/qgstranslationcontext.cpp
+++ b/src/core/qgstranslationcontext.cpp
@@ -1,10 +1,10 @@
 /***************************************************************************
-  qgstranslationcontext.cpp - %{Cpp:License:ClassName}
+  qgstranslationcontext.cpp
 
  ---------------------
  begin                : 23.5.2018
- copyright            : (C) 2018 by david
- email                : [your-email-here]
+ copyright            : (C) 2018 by David Signer
+ email                : david at opengis dot ch
  ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *