diff --git a/persistent-data/buffer.h b/persistent-data/buffer.h
index a8f755b..c0540c3 100644
--- a/persistent-data/buffer.h
+++ b/persistent-data/buffer.h
@@ -51,6 +51,10 @@ namespace persistent_data {
 		typedef boost::shared_ptr<buffer> ptr;
 		typedef boost::shared_ptr<buffer const> const_ptr;
 
+		size_t size() const {
+			return Size;
+		}
+
 		unsigned char &operator[](unsigned index) {
 			check_index(index);
 
diff --git a/unit-tests/Makefile.in b/unit-tests/Makefile.in
index eb4e579..57e164f 100644
--- a/unit-tests/Makefile.in
+++ b/unit-tests/Makefile.in
@@ -21,6 +21,9 @@ GMOCK_INCLUDES=\
 	-Igmock-1.6.0/include \
 	-Igmock-1.6.0/gtest/include
 
+GMOCK_FLAGS=\
+	-Wno-unused-local-typedefs
+
 GMOCK_LIBS=\
 	-Llib -lpdata -lgmock -lpthread
 
@@ -67,7 +70,7 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOURCE))
 
 %.gmo: %.cc
 	@echo "    [CXX] $<"
-	$(V) $(CXX) -c $(INCLUDES) $(GMOCK_INCLUDES) $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(INCLUDES) $(GMOCK_INCLUDES) $(CXXFLAGS) $(GMOCK_FLAGS) -o $@ $<
 
 unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
 	@echo "    [LD]  $<"
@@ -76,4 +79,4 @@ unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
 .PHONEY: unit-test
 
 unit-test: unit-tests/unit_tests
-	unit-tests/unit_tests
\ No newline at end of file
+	unit-tests/unit_tests
diff --git a/unit-tests/block_t.cc b/unit-tests/block_t.cc
index e659dc8..698397d 100644
--- a/unit-tests/block_t.cc
+++ b/unit-tests/block_t.cc
@@ -141,7 +141,7 @@ TEST(BlockTests, write_validator_works)
 
 	{
 		bm4096::write_ref wr = bm->write_lock(0, v);
-		::memset(wr.data().raw(), 23, sizeof(wr.data().raw()));
+		::memset(wr.data().raw(), 23, sizeof(wr.data().size()));
 	}
 
 	bm->flush();		// force the prepare method to be called
diff --git a/unit-tests/buffer_t.cc b/unit-tests/buffer_t.cc
index 41ce794..69fb6f3 100644
--- a/unit-tests/buffer_t.cc
+++ b/unit-tests/buffer_t.cc
@@ -93,7 +93,7 @@ TEST(BufferTest, buffer_128_a_2_succeeds)
 	uint32_t const sz = 128, align = 2;
 	buffer<sz, align>::ptr b = create_buffer<sz, align>();
 
-	ASSERT_TRUE(b);
+	ASSERT_TRUE(static_cast<bool>(b));
 }
 
 TEST(BufferTest, buffer_128_a_4_succeeds)
@@ -101,7 +101,7 @@ TEST(BufferTest, buffer_128_a_4_succeeds)
 	uint32_t const sz = 128, align = 4;
 	buffer<sz, align>::ptr b = create_buffer<sz, align>();
 
-	ASSERT_TRUE(b);
+	ASSERT_TRUE(static_cast<bool>(b));
 }
 
 // Varying buffer size, alignment 8
diff --git a/unit-tests/space_map_t.cc b/unit-tests/space_map_t.cc
index daeef10..c505ffb 100644
--- a/unit-tests/space_map_t.cc
+++ b/unit-tests/space_map_t.cc
@@ -108,7 +108,7 @@ namespace {
 		ASSERT_THAT(sm->get_nr_free(), Eq(NR_BLOCKS));
 
 		for (unsigned i = 0; i < NR_BLOCKS; i++) {
-			optional<block_address> mb = sm->new_block();
+			boost::optional<block_address> mb = sm->new_block();
 			ASSERT_TRUE(mb);
 			ASSERT_THAT(sm->get_nr_free(), Eq(NR_BLOCKS - i - 1));
 		}
@@ -121,7 +121,7 @@ namespace {
 
 	void test_runs_out_of_space(space_map::ptr sm)
 	{
-		optional<block_address> mb;
+		boost::optional<block_address> mb;
 
 		for (unsigned i = 0; i < NR_BLOCKS; i++)
 			mb = sm->new_block();
@@ -147,7 +147,7 @@ namespace {
 
 	void test_not_allocated_twice(space_map::ptr sm)
 	{
-		optional<block_address> mb = sm->new_block();
+		boost::optional<block_address> mb = sm->new_block();
 		ASSERT_TRUE(mb);
 
 		for (;;) {