diff --git a/samples/checkversion.c b/samples/checkversion.c
index 9d88cecd3..0e2359f91 100644
--- a/samples/checkversion.c
+++ b/samples/checkversion.c
@@ -43,10 +43,12 @@ int main(void)
 
     printf("__CC65__ defined as %04x\n", __CC65__);
     printf("compiler version is %u.%u\n", VER_MAJOR, VER_MINOR);
+#pragma warn (const-comparison, push, off)
     if (__CC65__ == VERSION) {
         printf("__CC65__ is defined correctly as (VER_MAJOR * 0x100) + VER_MINOR\n");
         return EXIT_SUCCESS;
     }
+#pragma warn (const-comparison, pop)
     printf("__CC65__ is incorrectly defined as (VER_MAJOR * 0x100) + (VER_MINOR * 0x10)\n");
     return EXIT_FAILURE;
 }
diff --git a/samples/joydemo.c b/samples/joydemo.c
index 56e825541..7375f23d3 100644
--- a/samples/joydemo.c
+++ b/samples/joydemo.c
@@ -26,9 +26,11 @@ int main (void)
     unsigned char num_joy;
     unsigned char raw_value;
     unsigned char i;
+#if DYN_DRV
     unsigned char err;
-    unsigned char y;
+#endif
 #ifdef USECONIO
+    unsigned char y;
     clrscr();
 #endif
     PRINTF("Driver init..." CR);