diff --git a/amiga/menu.c b/amiga/menu.c
index e1683932f..811f648ae 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -159,15 +159,15 @@ static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type,
 		}
 	}
 
-	if((GadToolsBase->LibNode.lib_Version > 53) ||
-		((GadToolsBase->LibNode.lib_Version == 53) && (GadToolsBase->LibNode.lib_Revision >= 5)) {
+	if((GadToolsBase->lib_Version > 53) ||
+		((GadToolsBase->lib_Version == 53) && (GadToolsBase->lib_Revision >= 5))) {
 		/* GadTools 53.5+ only. For now we will only create the menu
 			using label.image if there's a bitmap associated with the item. */
-		if(bitmap != NULL) {
+		if(bm != NULL) {
 			struct DrawInfo *dri = GetScreenDrawInfo(scrn);
-			struct BitMap *menu_icon = ami_bitmap_get_native(bitmap, 16, 16, NULL);
+			struct BitMap *menu_icon = ami_bitmap_get_native(bm, 16, 16, NULL);
 
-			gwin->menuobj[n] = LabelObject,
+			gwin->menuobj[num] = LabelObject,
 				LABEL_DrawInfo, dri,
 				LABEL_DisposeImage, TRUE,
 				LABEL_Image, BitMapObject,