diff --git a/docs/source/conf.py b/docs/source/conf.py
index 71430e2735..9c5407ddf7 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -91,7 +91,7 @@
 # The short X.Y version.
 version = u'0.3.1'
 # The full version, including alpha/beta/rc tags.
-release = u'0.3.1-rc4'
+release = u'0.3.1-rc5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/particle.param b/examples/KelvinHelmholtz/include/simulation_defines/param/particle.param
index a49b2af6f2..e275d8e366 100644
--- a/examples/KelvinHelmholtz/include/simulation_defines/param/particle.param
+++ b/examples/KelvinHelmholtz/include/simulation_defines/param/particle.param
@@ -51,9 +51,9 @@ namespace particles
     /** a particle with a weighting below MIN_WEIGHTING will not
      *      be created / will be deleted
      *  unit: none */
-    const float_X MIN_WEIGHTING = 10.0;
+    constexpr float_X MIN_WEIGHTING = 10.0;
 
-    const uint32_t TYPICAL_PARTICLES_PER_CELL = mCT::volume<
+    constexpr uint32_t TYPICAL_PARTICLES_PER_CELL = mCT::volume<
         startPosition::QuietParam::numParticlesPerDimension
     >::type::value;
 
diff --git a/src/picongpu/include/version.hpp b/src/picongpu/include/version.hpp
index 39258c3c4b..707220690b 100644
--- a/src/picongpu/include/version.hpp
+++ b/src/picongpu/include/version.hpp
@@ -22,4 +22,4 @@
 #define PICONGPU_VERSION_MAJOR 0
 #define PICONGPU_VERSION_MINOR 3
 #define PICONGPU_VERSION_PATCH 1
-#define PICONGPU_VERSION_LABEL "rc4"
+#define PICONGPU_VERSION_LABEL "rc5"
diff --git a/src/tools/bin/pic2xdmf.py b/src/tools/bin/pic2xdmf.py
index 6e6a6da19a..5846e75b3d 100755
--- a/src/tools/bin/pic2xdmf.py
+++ b/src/tools/bin/pic2xdmf.py
@@ -36,8 +36,8 @@
 NAME_DELIM = "/"
 
 # PIC-specific names
-NAME_GLOBALCELLIDX = "globalCellIdx"
-NAME_POSITION= "position"
+NAME_GLOBALCELLIDX = "positionOffset"
+NAME_POSITION = "position"
 
 def get_vector_basename(vector_name):
     """