diff --git a/src/save.c b/src/save.c
index 254c8efc..d20067ad 100644
--- a/src/save.c
+++ b/src/save.c
@@ -822,7 +822,6 @@ int plot_raw_custom_data(int sweep_idx, int first, int last, const char *expr)
 double get_raw_value(int dataset, int idx, int point)
 {
   int i, ofs;
-  Graph_ctx *gr = &xctx->graph_struct;
   ofs = 0;
   if(xctx->graph_values) {
     if(dataset == -1) {
diff --git a/src/scheduler.c b/src/scheduler.c
index 77060274..9939758f 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -1712,6 +1712,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
     if(!strcmp(argv[1],"net_label"))
     {
       cmd_found = 1;
+      unselect_all();
       if(argc>=3) place_net_label(atoi(argv[2]));
     }
    
@@ -1870,6 +1871,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
 
       xctx->semaphore++;
       xctx->last_command = 0;
+      unselect_all();
       xctx->mx_double_save = xctx->mousex_snap;
       xctx->my_double_save = xctx->mousey_snap;
       if(place_text(0, xctx->mousex_snap, xctx->mousey_snap)) { /* 1 = draw text 24122002 */