diff --git a/extern/aclMock/acl/acl.h b/extern/aclMock/include/acl/acl.h
similarity index 100%
rename from extern/aclMock/acl/acl.h
rename to extern/aclMock/include/acl/acl.h
diff --git a/extern/aclMock/acl/acl_base.h b/extern/aclMock/include/acl/acl_base.h
similarity index 100%
rename from extern/aclMock/acl/acl_base.h
rename to extern/aclMock/include/acl/acl_base.h
diff --git a/extern/aclMock/acl/acl_mdl.h b/extern/aclMock/include/acl/acl_mdl.h
similarity index 100%
rename from extern/aclMock/acl/acl_mdl.h
rename to extern/aclMock/include/acl/acl_mdl.h
diff --git a/extern/aclMock/acl/acl_op.h b/extern/aclMock/include/acl/acl_op.h
similarity index 100%
rename from extern/aclMock/acl/acl_op.h
rename to extern/aclMock/include/acl/acl_op.h
diff --git a/extern/aclMock/acl/acl_op_compiler.h b/extern/aclMock/include/acl/acl_op_compiler.h
similarity index 100%
rename from extern/aclMock/acl/acl_op_compiler.h
rename to extern/aclMock/include/acl/acl_op_compiler.h
diff --git a/extern/aclMock/acl/acl_rt.h b/extern/aclMock/include/acl/acl_rt.h
similarity index 100%
rename from extern/aclMock/acl/acl_rt.h
rename to extern/aclMock/include/acl/acl_rt.h
diff --git a/extern/aclMock/acl/acl_rt_allocator.h b/extern/aclMock/include/acl/acl_rt_allocator.h
similarity index 100%
rename from extern/aclMock/acl/acl_rt_allocator.h
rename to extern/aclMock/include/acl/acl_rt_allocator.h
diff --git a/extern/aclMock/acl/error_codes/ge_error_codes.h b/extern/aclMock/include/acl/error_codes/ge_error_codes.h
similarity index 100%
rename from extern/aclMock/acl/error_codes/ge_error_codes.h
rename to extern/aclMock/include/acl/error_codes/ge_error_codes.h
diff --git a/extern/aclMock/acl/error_codes/rt_error_codes.h b/extern/aclMock/include/acl/error_codes/rt_error_codes.h
similarity index 100%
rename from extern/aclMock/acl/error_codes/rt_error_codes.h
rename to extern/aclMock/include/acl/error_codes/rt_error_codes.h
diff --git a/extern/aclMock/meson.build b/extern/aclMock/meson.build
index f35ff186..87a4a451 100644
--- a/extern/aclMock/meson.build
+++ b/extern/aclMock/meson.build
@@ -10,7 +10,7 @@ project(
 
 # HiCR acl Mock Backend Configuration
 
-backendIncludes = include_directories(['.'])
+backendIncludes = include_directories(['include'])
 
 aclDependency = declare_dependency(
   sources: ['acl.cpp'],
diff --git a/include/hicr/backends/nosv/computeManager.hpp b/include/hicr/backends/nosv/computeManager.hpp
index 391776b4..a0b35547 100644
--- a/include/hicr/backends/nosv/computeManager.hpp
+++ b/include/hicr/backends/nosv/computeManager.hpp
@@ -51,7 +51,7 @@ class ComputeManager : public HiCR::ComputeManager
    * \param[in] executionUnit The replicable function to execute
    * @return The newly created execution unit
    */
-  __INLINE__ std::shared_ptr<HiCR::ExecutionUnit> createExecutionUnit(const std::function<void(void *)> &executionUnit) override
+  __INLINE__ std::shared_ptr<HiCR::ExecutionUnit> createExecutionUnit(const replicableFc_t &executionUnit) override
   {
     return std::make_shared<HiCR::backend::nosv::ExecutionUnit>(executionUnit);
   }