diff --git a/src/MeshTools/CombineIndexedArrays.h b/src/MeshTools/CombineIndexedArrays.h
index 59fa27c87..ab56624ec 100644
--- a/src/MeshTools/CombineIndexedArrays.h
+++ b/src/MeshTools/CombineIndexedArrays.h
@@ -128,6 +128,8 @@ std::vector<UnsignedInt> indices = MeshTools::combineIndexedArrays(
 attributes indexed with `indices`.
 
 @attention The function expects that all arrays have the same size.
+@todo Use `std::pair` (to avoid `std::make_tuple`), make this usable also at
+    runtime
 */
 /* Implementation note: It's done using tuples because it is more clear which
    parameter is index array and which is attribute array, mainly when both are
diff --git a/src/MeshTools/Interleave.h b/src/MeshTools/Interleave.h
index e9b33feed..cb6644162 100644
--- a/src/MeshTools/Interleave.h
+++ b/src/MeshTools/Interleave.h
@@ -201,6 +201,7 @@ mesh.setVertexCount(attribute.size());
 @endcode
 
 @see @ref MeshTools::compressIndices()
+@todo rework so Mesh & Buffer doesn't need to be included in header
 */
 template<class ...T> inline void interleave(Mesh& mesh, Buffer& buffer, BufferUsage usage, const T&... attributes) {
     return Implementation::Interleave()(mesh, buffer, usage, attributes...);