diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6904f17f5f14f269c0a1b6c650b8bd68605b850e..21e813fa9d8f0da8da5099d391c242fdd3c204d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,10 +175,10 @@ include_directories("${PROJECT_SOURCE_DIR}/connector/c/tntnet/include")
 # Specify prefixes
 #
 if (NOT DEFINED CMAKE_SYSCONF_DIR)
-    set (CMAKE_SYSCONF_DIR "${CMAKE_INSTALL_PREFIX}/etc")
+    set (CMAKE_SYSCONF_DIR "etc")
 endif()
 if (NOT DEFINED CMAKE_LOCALSTATE_DIR)
-    set (CMAKE_LOCALSTATE_DIR "${CMAKE_INSTALL_PREFIX}/var")
+    set (CMAKE_LOCALSTATE_DIR "var")
 endif()
 
 #
diff --git a/connector/c/tnt/tnt_buf.c b/connector/c/tnt/tnt_buf.c
index 6137a7d98646fedba0060f63449eff6312a8e779..6eae0d467acd2a924f685cf5d303224031c7a03e 100644
--- a/connector/c/tnt/tnt_buf.c
+++ b/connector/c/tnt/tnt_buf.c
@@ -116,7 +116,7 @@ tnt_buf_reply(struct tnt_stream *s, struct tnt_reply *r) {
 	if (sb->size == sb->rdoff)
 		return 1;
 	size_t off = 0;
-	int rc = tnt_reply(r, s->data + sb->rdoff, sb->size - sb->rdoff, &off);
+	int rc = tnt_reply(r, sb->data + sb->rdoff, sb->size - sb->rdoff, &off);
 	if (rc == 0)
 		sb->rdoff += off;
 	return rc;