diff --git a/src/dbnode/storage/errors/types.go b/src/dbnode/storage/errors/types.go
index 7854185c52..6d55d62735 100644
--- a/src/dbnode/storage/errors/types.go
+++ b/src/dbnode/storage/errors/types.go
@@ -35,9 +35,10 @@ var (
 	ErrTooPast = xerrors.NewInvalidParamsError(errors.New("datapoint is too far in the past"))
 
 	// ErrColdWritesNotEnabled is returned when cold writes are disabled
-	// and a write is too far in the past or future.
+	// and a write is too far in the past or future. Note, the error intentionally
+	// excludes anything regarding the cold writes feature until its release.
 	ErrColdWritesNotEnabled = xerrors.NewInvalidParamsError(errors.New(
-		"cold writes not enabled and datapoint is too far in the past or future"))
+		"datapoint is too far in the past or future"))
 )
 
 // NewUnknownNamespaceError returns a new error indicating an unknown namespace parameter.
diff --git a/src/dbnode/storage/series/buffer.go b/src/dbnode/storage/series/buffer.go
index f646397560..1489eebdab 100644
--- a/src/dbnode/storage/series/buffer.go
+++ b/src/dbnode/storage/series/buffer.go
@@ -29,10 +29,10 @@ import (
 	"github.com/m3db/m3/src/dbnode/clock"
 	"github.com/m3db/m3/src/dbnode/digest"
 	"github.com/m3db/m3/src/dbnode/encoding"
+	"github.com/m3db/m3/src/dbnode/namespace"
 	"github.com/m3db/m3/src/dbnode/persist"
 	"github.com/m3db/m3/src/dbnode/storage/block"
 	m3dberrors "github.com/m3db/m3/src/dbnode/storage/errors"
-	"github.com/m3db/m3/src/dbnode/namespace"
 	"github.com/m3db/m3/src/dbnode/ts"
 	"github.com/m3db/m3/src/dbnode/x/xio"
 	"github.com/m3db/m3/src/x/context"
@@ -79,7 +79,7 @@ type databaseBuffer interface {
 		id ident.ID,
 		tags ident.Tags,
 		persistFn persist.DataFn,
-                nsCtx namespace.Context,
+		nsCtx namespace.Context,
 	) error
 
 	Flush(