diff --git a/backend/umax_pp.c b/backend/umax_pp.c
index ef2ed6576..0eac1c5c1 100644
--- a/backend/umax_pp.c
+++ b/backend/umax_pp.c
@@ -104,7 +104,7 @@
 
 /* if you change the source, please set UMAX_PP_STATE to "devel". Do *not*
  * change the UMAX_PP_BUILD. */
-#define UMAX_PP_BUILD	8
+#define UMAX_PP_BUILD	9
 #define UMAX_PP_STATE	"devel"
 
 static int num_devices = 0;
diff --git a/backend/umax_pp_low.c b/backend/umax_pp_low.c
index 634368a69..0dcda26d4 100644
--- a/backend/umax_pp_low.c
+++ b/backend/umax_pp_low.c
@@ -2542,7 +2542,6 @@ SendWord (int *cmd)
     default:
       return (SendWord1220P (cmd));
     }
-  return (0);
 }
 
 
@@ -4088,7 +4087,6 @@ sanei_umax_pp_InitTransport (int recover)
     default:
       return (InitTransport1220P (recover));
     }
-  return (0);
 }
 
 
@@ -5364,7 +5362,6 @@ Prologue (void)
     default:
       return (connect_epat ());
     }
-  return (0);
 }
 
 
@@ -5382,7 +5379,6 @@ Epilogue (void)
     default:
       return (deconnect_epat ());
     }
-  return (0);
 }
 
 
@@ -6746,8 +6742,7 @@ MoveToOrigin (void)
   if ((edge <= 30) && (sanei_umax_pp_getastra () != 1600))
     {
       DBG (2, "MoveToOrigin() detected a 1600P");
-      if (!sanei_umax_pp_getastra ())
-	sanei_umax_pp_setastra (1600);
+      sanei_umax_pp_setastra (1600);
     }
   edge = EdgePosition (300, 180, buffer);
   /* rounded to lowest integer, since upping origin might lead */