diff --git a/src/callback.c b/src/callback.c
index cf6e73b7..59b147af 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -3810,9 +3810,6 @@ int rstate; /* (reduced state, without ShiftMask) */
          else move_objects(START,0,0,0);
        }
 
-       #ifndef __unix__
-       draw_selection(xctx->gc[SELLAYER], 0);
-       #endif
        if(tclgetboolvar("auto_hilight") && !xctx->shape_point_selected) {
          if(!(state & ShiftMask) && xctx->hilight_nets && sel.type == 0 ) {
            if(!prev_last_sel) {
@@ -3940,16 +3937,7 @@ int rstate; /* (reduced state, without ShiftMask) */
        }
      }
    }
-
-#ifndef __unix__
-  case MOUSE_WHEEL_UP:  /* windows do not use button4 and button5 like X */
-  {
-    xctx->xorigin += -CADMOVESTEP * xctx->zoom / 2.;
-    draw();
-  }
-#endif
    break;
-
   default:
    dbg(1, "callback(): Event:%d\n",event);
    break;
diff --git a/src/draw.c b/src/draw.c
index 650d97dc..f7778072 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -971,11 +971,11 @@ static void drawgrid()
 {
   double x,y;
   double delta,tmp;
+  double mult;
   #if DRAW_ALL_CAIRO==0
   int i=0;
   int big_gr = tclgetboolvar("big_grid_points");
   int axes = tclgetboolvar("draw_grid_axes");
-  double mult;
   
   #endif
   dbg(1, "drawgrid(): draw grid\n");
@@ -1178,9 +1178,6 @@ void drawline(int c, int what, double linex1, double liney1, double linex2, doub
         XDrawLine(display, xctx->window, xctx->gc[c], rr[j].x1, rr[j].y1, rr[j].x2, rr[j].y2);
       if (xctx->draw_pixmap)
         XDrawLine(display, xctx->save_pixmap, xctx->gc[c], rr[j].x1, rr[j].y1, rr[j].x2, rr[j].y2);
-      #if HAS_CAIRO==1
-      check_cairo_drawline(ct, c, rr[j].x1, rr[j].y1, rr[j].x2, rr[j].y2, 0);
-      #endif
     }
 #endif
    i=0;
@@ -1217,9 +1214,6 @@ void drawline(int c, int what, double linex1, double liney1, double linex2, doub
    if(dash) {
      XSetLineAttributes (display, xctx->gc[c], XLINEWIDTH(xctx->lw), LineSolid, LINECAP, LINEJOIN);
    }
-   #if !defined(__unix__) && HAS_CAIRO==1
-   check_cairo_drawline(ct, c, x1, y1, x2, y2, dash);
-   #endif
   }
  }
 
@@ -1240,9 +1234,6 @@ void drawline(int c, int what, double linex1, double liney1, double linex2, doub
    }
    if(xctx->draw_window) XDrawLine(display, xctx->window, xctx->gc[c], (int)x1, (int)y1, (int)x2, (int)y2);
    if(xctx->draw_pixmap) XDrawLine(display, xctx->save_pixmap, xctx->gc[c], (int)x1, (int)y1, (int)x2, (int)y2);
-   #if !defined(__unix__) && HAS_CAIRO==1
-   check_cairo_drawline(ct, c, x1, y1, x2, y2, dash);
-   #endif
    XSetLineAttributes (display, xctx->gc[c], XLINEWIDTH(xctx->lw), LineSolid, LINECAP , LINEJOIN);
   }
  }
@@ -1257,9 +1248,6 @@ void drawline(int c, int what, double linex1, double liney1, double linex2, doub
        XDrawLine(display, xctx->window, xctx->gc[c], rr[j].x1, rr[j].y1, rr[j].x2, rr[j].y2);
      if (xctx->draw_pixmap)
        XDrawLine(display, xctx->save_pixmap, xctx->gc[c], rr[j].x1, rr[j].y1, rr[j].x2, rr[j].y2);
-     #if HAS_CAIRO==1
-     check_cairo_drawline(ct, c, rr[j].x1, rr[j].y1, rr[j].x2, rr[j].y2, 0);
-     #endif
    }
 #endif
   i=0;
@@ -2751,9 +2739,6 @@ static void draw_graph_points(int idx, int first, int last,
       }
       /*XDrawLines(display, xctx->window, xctx->gc[wave_col], point, poly_npoints, CoordModeOrigin);*/
     }
-    #if !defined(__unix__) && HAS_CAIRO==1
-    check_cairo_drawpoints(ct, wave_col, point, poly_npoints);
-    #endif
     set_thick_waves(0, wcnt, wave_col, gr);
   } else dbg(1, "skipping wave: %s\n", raw->names[idx]);
   for(p=0;p<cadlayers; ++p) {
@@ -4882,7 +4867,7 @@ void draw(void)
     }
     /* do_copy_area is zero only when doing png hardcopy to avoid video flickering */
     if(xctx->do_copy_area) {
-      if(!xctx->draw_window && xctx->save_pixmap) {
+      if(!xctx->draw_window && xctx->draw_pixmap) {
         MyXCopyArea(display, xctx->save_pixmap, xctx->window, xctx->gc[0], xctx->xrect[0].x, xctx->xrect[0].y,
            xctx->xrect[0].width, xctx->xrect[0].height, xctx->xrect[0].x, xctx->xrect[0].y);
       }
diff --git a/src/save.c b/src/save.c
index d69b2bee..8121a324 100644
--- a/src/save.c
+++ b/src/save.c
@@ -414,7 +414,7 @@ static int read_raw_ascii_point(int ac, double *tmp, FILE *fd)
       dbg(1, "premature end of ascii block\n");
       return lines;
     }
-    if(line[0] == '\n') {
+    if(line[0] == '\n' || (line[0] == '\r' && line[1] == '\n')) {
       dbg(1, "found empty line --> return\n");
       break;
     }