diff --git a/src/buffer.c b/src/buffer.c
index 80d4ece06a1..1d363738342 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -931,7 +931,7 @@ If BUFFER is omitted, the current buffer is buried.")
     }
 
   /* Remove it from the screen.  */
-  if (EQ (buf, XWINDOW (selected_frame)->buffer))
+  if (EQ (buf, XWINDOW (selected_window)->buffer))
     Fswitch_to_buffer (Fother_buffer (buf), Qnil);
 
   /* Move it to the end of the buffer list.  */
diff --git a/src/data.c b/src/data.c
index 9b45fc61c30..50813f672b2 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1649,7 +1649,7 @@ Both must be numbers or markers.")
 
       f1 = XTYPE (num1) == Lisp_Float ? XFLOAT (num1)->data : XINT (num1);
       f2 = XTYPE (num2) == Lisp_Float ? XFLOAT (num2)->data : XINT (num2);
-#ifdef USG
+#if defined (USG) || defined (sun) || defined (ultrix) || defined (hpux)
       f1 = fmod (f1, f2);
 #else
       f1 = drem (f1, f2);