diff --git a/autoload/splicelib/modes.py b/autoload/splicelib/modes.py
index cd8eaa3..7bdae16 100644
--- a/autoload/splicelib/modes.py
+++ b/autoload/splicelib/modes.py
@@ -13,8 +13,9 @@ def __init__(self):
 
 
     def diff(self, diffmode):
-        with windows.remain():
-            getattr(self, '_diff_%d' % diffmode)()
+        with buffers.remain():
+            with windows.remain():
+                getattr(self, '_diff_%d' % diffmode)()
 
         # Reset the scrollbind to whatever it was before we diffed.
         if not diffmode:
diff --git a/autoload/splicelib/util/bufferlib.py b/autoload/splicelib/util/bufferlib.py
index 90d057c..ca5cde1 100644
--- a/autoload/splicelib/util/bufferlib.py
+++ b/autoload/splicelib/util/bufferlib.py
@@ -80,7 +80,7 @@ def labels(self):
 
     class remain:
         def __enter__(self):
-            self.curbuf = vim.eval('bufnr(bufname("%"))')
+            self.curbuf = int(vim.eval('bufnr(bufname("%"))'))
             self.pos = windows.pos()
 
         def __exit__(self, type, value, traceback):