diff --git a/libs/superdrops/superdrop_ids.hpp b/libs/superdrops/superdrop_ids.hpp
index ecb438b55..a17d561dc 100644
--- a/libs/superdrops/superdrop_ids.hpp
+++ b/libs/superdrops/superdrop_ids.hpp
@@ -8,7 +8,7 @@
  * Author: Clara Bayley (CB)
  * Additional Contributors: Tobias Kölling (TK)
  * -----
- * Last Modified: Saturday 20th April 2024
+ * Last Modified: Friday 3rd May 2024
  * Modified By: CB
  * -----
  * License: BSD 3-Clause "New" or "Revised" License
@@ -33,6 +33,7 @@
 struct IntID {
   size_t value; /**< Value of the SD identity. */
 
+  KOKKOS_INLINE_FUNCTION
   size_t get_value() const { return value; }
 
   /**
@@ -81,6 +82,7 @@ struct IntID {
  * @brief Struct for non-existent (no memory) SD identity.
  */
 struct EmptyID {
+  KOKKOS_INLINE_FUNCTION
   size_t get_value() const { return LIMITVALUES::uint64_t_max; }
 
   /**
diff --git a/src/main_impl.hpp b/src/main_impl.hpp
index 6d124c43e..0f2bfad0b 100644
--- a/src/main_impl.hpp
+++ b/src/main_impl.hpp
@@ -9,7 +9,7 @@
  * Author: Clara Bayley (CB)
  * Additional Contributors:
  * -----
- * Last Modified: Tuesday 30th April 2024
+ * Last Modified: Friday 3rd May 2024
  * Modified By: CB
  * -----
  * License: BSD 3-Clause "New" or "Revised" License
@@ -112,13 +112,13 @@ inline Motion<CartesianMaps> auto create_motion(const unsigned int motionstep) {
 }
 
 inline auto create_boundary_conditions(const Config &config) {
-  return AddSupersAtDomainTop(config.get_addsupersatdomaintop());
-  // return NullBoundaryConditions{};
+  // return AddSupersAtDomainTop(config.get_addsupersatdomaintop());
+  return NullBoundaryConditions{};
 }
 
 template <GridboxMaps GbxMaps>
 inline auto create_movement(const Config &config, const Timesteps &tsteps, const GbxMaps &gbxmaps) {
-  const Motion<GbxMaps> auto motion(create_motion(tsteps.get_motionstep()));
+  const auto motion(create_motion(tsteps.get_motionstep()));
 
   const auto boundary_conditions(create_boundary_conditions(config));