diff --git a/README_SETUP.md b/README_SETUP.md
index aaf0e16a8966d8937ac44d224b4c3c181daf55f5..bdb8a03e4c58576b35e50b2090b889c120ae23cd 100644
--- a/README_SETUP.md
+++ b/README_SETUP.md
@@ -48,7 +48,7 @@ as compiler. We use [cmake](https://cmake.org/download/) as build tool.
    and build the project. (You can open Tools/Command Line/Developer Command
    Prompt and execute `msbuild libcaosdb.sln /property:Configuration=Release`)
 
-### Creating a Local Conan Build ##
+### Creating a local Conan package ##
 
 Building and installing libcaosdb with Conan is just a single command:  
 `conan create . -s "compiler.libcxx=libstdc++11"`
diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp
index ef9eaa6437807d0241769014da72fd1c5cd9287b..e8b0a849bb58a8b1228a2249e2755da53e6f1132 100644
--- a/src/ccaosdb.cpp
+++ b/src/ccaosdb.cpp
@@ -469,6 +469,9 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                     return status.GetCode();
                   })
 
+// TODO(fspreck) Results sets have to be worked over once they have
+// been fixed in the cpplib. Afterwards, creation and at have to be
+// re-implemented.
 ERROR_RETURN_CODE(GENERIC_ERROR,
                   int caosdb_transaction_transaction_get_result_set(
                     caosdb_transaction_transaction *transaction,