diff --git a/minichlink/minichlink.c b/minichlink/minichlink.c
index 0513750e3eabf1ca302d370c1941fe092d597341..191237b6a124779b5501355605dce8edbc06d705 100644
--- a/minichlink/minichlink.c
+++ b/minichlink/minichlink.c
@@ -41,13 +41,10 @@ void * MiniCHLinkInitAsDLL( struct MiniChlinkFunctions ** MCFO )
 	{
 		fprintf( stderr, "Found NHC-Link042 Programmer\n" );
 	}
-
-#ifndef DISABLE_ARDULINK
 	else if ((dev = TryInit_Ardulink()))
 	{
 		fprintf( stderr, "Found Ardulink Programmer\n" );
 	}
-#endif
 	else
 	{
 		fprintf( stderr, "Error: Could not initialize any supported programmers\n" );
diff --git a/minichlink/serial_dev.c b/minichlink/serial_dev.c
index 7afe36d394ddbfea36e5f763e523da1a823b17ac..5a35fbe3d45fa1ec9b74886f4c4bddab89d89dcb 100644
--- a/minichlink/serial_dev.c
+++ b/minichlink/serial_dev.c
@@ -58,7 +58,7 @@ int serial_dev_open(serial_dev_t *dev) {
         return -1;
     }
 
-    if (tcgetattr(ctx->fd, &attr) == -1) {
+    if (tcgetattr(dev->fd, &attr) == -1) {
         perror("tcgetattr");
         return -2;
     }
@@ -66,7 +66,7 @@ int serial_dev_open(serial_dev_t *dev) {
     cfmakeraw(&attr);
     cfsetspeed(&attr, dev->baud);
 
-    if (tcsetattr(ctx->fd, TCSANOW, &attr) == -1) {
+    if (tcsetattr(dev->fd, TCSANOW, &attr) == -1) {
         perror("tcsetattr");
         return -3;
     }