diff --git a/fastlib/u/nvasil/mmanager_with_tpie/build.py b/fastlib/u/nvasil/mmanager_with_tpie/build.py
index 1b327ddbbf..22e87ad5da 100644
--- a/fastlib/u/nvasil/mmanager_with_tpie/build.py
+++ b/fastlib/u/nvasil/mmanager_with_tpie/build.py
@@ -2,8 +2,7 @@ binrule(
 		name="test",
 		sources=["memory_manager_unit.cc"],
 		headers=lglob("*.h"),
-		cflags="-I../tpie",
-		linkables=["libsigsegv.a", 
-		           "fastlib:fastlib",
+		cflags="-I../tpie -Lsigsegv",
+		linkables=["fastlib:fastlib",
 							 "u/nvasil/tpie:tpie"]
 		);
diff --git a/fastlib/u/nvasil/mmanager_with_tpie/memory_manager.h b/fastlib/u/nvasil/mmanager_with_tpie/memory_manager.h
index 7fa8d72ade..60b76f46a3 100644
--- a/fastlib/u/nvasil/mmanager_with_tpie/memory_manager.h
+++ b/fastlib/u/nvasil/mmanager_with_tpie/memory_manager.h
@@ -112,7 +112,8 @@ class MemoryManager {
 		}
 		template<typename ARRAYTYPE>
 		void Copy(ARRAYTYPE other, index_t length) {
-			T *p1=reinterpret_cast<T>(allocator_->Access(address_));
+			T *p1=reinterpret_cast<T>(allocator_->Access(
+						Ptr<T,logmode>::address_));
 			T *p2=other.get();
 		  for(index_t i=0; i<length; i++) {
 			  p1[i] = p2[i];
diff --git a/fastlib/u/nvasil/mmanager_with_tpie/memory_manager_impl.h b/fastlib/u/nvasil/mmanager_with_tpie/memory_manager_impl.h
index 463a4d47a9..94c01ec1d6 100644
--- a/fastlib/u/nvasil/mmanager_with_tpie/memory_manager_impl.h
+++ b/fastlib/u/nvasil/mmanager_with_tpie/memory_manager_impl.h
@@ -71,7 +71,7 @@ void MEMORY_MANAGER__::Initialize() {
 	// Block transfer engine Initializations
 	MM_manager.ignore_memory_limit();
 	AMI_err ae;
-	disk_= new AMI_STREAM(cache_file_.c_str());
+	disk_= new AMI_STREAM<Page_t>(cache_file_.c_str());
 	for(index_t i=0; i< num_of_pages_; i++) {
 	  if ((ae=disk_.write_array((Page_t *)(cache_+i*page_size_),
 		  	 kTPIEPageSize/page_size_))!=AMI_ERROR_NO_ERROR) {