diff --git a/utils/cloudio/SMFileFactory.cpp b/utils/cloudio/SMFileFactory.cpp
index f4a8b1154..6cee3538b 100644
--- a/utils/cloudio/SMFileFactory.cpp
+++ b/utils/cloudio/SMFileFactory.cpp
@@ -20,6 +20,8 @@
 #include "SMFileFactory.h"
 #include "SMDataFile.h"
 #include "SMComm.h"
+#include "BufferedFile.h"
+#include "IDBDataFile.h"
 
 using namespace std;
 
@@ -28,6 +30,10 @@ namespace idbdatafile {
 
 IDBDataFile* SMFileFactory::open(const char *filename, const char *mode, unsigned opts, unsigned colWidth)
 {
+    // TODO, test whether this breaks anything.
+    //if (opts & IDBDataFile::USE_TMPFILE)
+    //    return new BufferedFile(filename, mode, opts);
+        
     bool _read = false;
     bool _write = false;
     bool create = false;
diff --git a/utils/cloudio/SMFileSystem.cpp b/utils/cloudio/SMFileSystem.cpp
index 89fd0acfb..2bc455917 100644
--- a/utils/cloudio/SMFileSystem.cpp
+++ b/utils/cloudio/SMFileSystem.cpp
@@ -68,7 +68,7 @@ int SMFileSystem::rename(const char *oldFile, const char *newFile)
     int err = copyFile(oldFile, newFile);
     if (err)
         return err;
-    err = unlink(oldFile);
+    err = this->remove(oldFile);
     return err;
 }
 
diff --git a/utils/idbdatafile/IDBFactory.cpp b/utils/idbdatafile/IDBFactory.cpp
index 17a93ec27..1956dbf61 100644
--- a/utils/idbdatafile/IDBFactory.cpp
+++ b/utils/idbdatafile/IDBFactory.cpp
@@ -110,7 +110,6 @@ vector<IDBDataFile::Types> IDBFactory::listPlugins()
 
 IDBDataFile* IDBFactory::open(IDBDataFile::Types type, const char* fname, const char* mode, unsigned opts, unsigned colWidth)
 {
-    /* If this is a tmp file, ie opts & USE_TMPFILE, might want to force that to be a local file */
     if ( s_plugins.find(type) == s_plugins.end() )
     {
         ostringstream oss;
diff --git a/versioning/BRM/slavecomm.cpp b/versioning/BRM/slavecomm.cpp
index 9ff1fd165..24f84976e 100644
--- a/versioning/BRM/slavecomm.cpp
+++ b/versioning/BRM/slavecomm.cpp
@@ -1889,7 +1889,8 @@ void SlaveComm::do_vbRollback1(ByteStream& msg)
     if (!standalone)
         master.write(reply);
 
-    takeSnapshot = true;
+    //takeSnapshot = true;
+    doSaveDelta = true;
 }
 
 void SlaveComm::do_vbRollback2(ByteStream& msg)