diff --git a/headers/build/private/storage/OffsetFile.h b/headers/build/private/storage/OffsetFile.h
index 35cab07d91..4f375b7cc0 100644
--- a/headers/build/private/storage/OffsetFile.h
+++ b/headers/build/private/storage/OffsetFile.h
@@ -49,7 +49,7 @@ public:
 	off_t Position() const;
 
 	status_t SetSize(off_t size);
-	status_t GetSize(off_t *size);
+	status_t GetSize(off_t *size) const;
 
 	off_t Offset() const;
 
diff --git a/src/build/libbe/storage/OffsetFile.cpp b/src/build/libbe/storage/OffsetFile.cpp
index 10e41b7e15..b21b4e88a2 100644
--- a/src/build/libbe/storage/OffsetFile.cpp
+++ b/src/build/libbe/storage/OffsetFile.cpp
@@ -16,7 +16,7 @@ namespace Storage {
 
 // constructor
 OffsetFile::OffsetFile()
-	: fFile(),
+	: fFile(NULL),
 	  fOffset(0),
 	  fCurrentPosition(0)
 {
@@ -145,7 +145,7 @@ OffsetFile::SetSize(off_t size)
 
 // GetSize
 status_t
-OffsetFile::GetSize(off_t *size)
+OffsetFile::GetSize(off_t *size) const
 {
 	status_t error = (size ? B_OK : B_BAD_VALUE );
 	if (error == B_OK)