diff --git a/driver/linux/Makefile b/driver/linux/Makefile
index 97952bd..e2cd7cf 100644
--- a/driver/linux/Makefile
+++ b/driver/linux/Makefile
@@ -98,7 +98,7 @@ $(NAME).ko: *.c *.h
 	sed -i 's/#define VENDOR_ID1 [^\n]*/#define VENDOR_ID1 0x$(VENDOR_ID1)/g' $(DRVR_HDR)
 	sed -i 's/#define DEBUG [^\n]*/#define DBUG 1/g' $(DRVR_HDR)
 	sed -i 's/#define DBUG [^\n]*/#define $(DBUGVAL) 1/g' $(DRVR_HDR)
-	make -C $(KDIR) SUBDIRS=`pwd` modules
+	make -C $(KDIR) M=$(shell pwd) modules
 	rm -rf $(LIB_OBJS)
 
 $(NAME).so.$(LIB_VER): $(LIB_OBJS)
diff --git a/driver/linux/riffa_driver.c b/driver/linux/riffa_driver.c
index f9e34c9..817236a 100644
--- a/driver/linux/riffa_driver.c
+++ b/driver/linux/riffa_driver.c
@@ -463,7 +463,7 @@ static inline struct sg_mapping * fill_sg_buf(struct fpga_state * sc, int chnl,
 		num_pages = get_user_pages(current, current->mm, udata, num_pages_reqd, 1, 0, pages, NULL);
 		#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
 		num_pages = get_user_pages(udata, num_pages_reqd, 1, 0, pages, NULL);
-		#elsif LINUX_VERSION_CODE < KERNEL_VERSION(6,5,0)
+		#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,5,0)
 		num_pages = get_user_pages(udata, num_pages_reqd, FOLL_WRITE, pages, NULL);
 		#else
 		num_pages = get_user_pages(udata, num_pages_reqd, FOLL_WRITE, pages);