diff --git a/BootHFS/Makefile.win b/BootHFS/Makefile.win
index 8f02a2da0..184038567 100644
--- a/BootHFS/Makefile.win
+++ b/BootHFS/Makefile.win
@@ -8,11 +8,7 @@
 NASM=nasm
 # !endif
 
-all: boot0 boot0af boot0ss boot0md boot1h boot1h2 boot1f32 boot1f32alt boot1x boot1xalt
-
-boot0: boot0.s
-	@echo -^> "$@"
-	@"$(NASM)" $(@F).s -o $(DESTDIR)\$@
+all: boot0af boot0ss boot0md boot1h boot1h2 boot1f32 boot1f32alt boot1x boot1xalt
 
 boot0af: boot0af.s
 	@echo -^> "$@"
@@ -51,4 +47,4 @@ boot1xalt: boot1xalt.s
 	@"$(NASM)" $(@F).s -o $(DESTDIR)\$@
 
 clean:
-	del /f boot0 boot0af boot0ss boot0md boot1h boot1h2 boot1f32 boot1f32alt boot1x boot1xalt *~
+	del /f boot0af boot0ss boot0md boot1h boot1h2 boot1f32 boot1f32alt boot1x boot1xalt *~
diff --git a/rEFIt_UEFI/libeg/XPointer.cpp b/rEFIt_UEFI/libeg/XPointer.cpp
index ccb02840f..f93f84c1b 100644
--- a/rEFIt_UEFI/libeg/XPointer.cpp
+++ b/rEFIt_UEFI/libeg/XPointer.cpp
@@ -184,7 +184,7 @@ VOID XPointer::UpdatePointer()
     if (newPlace.YPos < 0) newPlace.YPos = 0;
     if (newPlace.YPos > UGAHeight - 1) newPlace.YPos = UGAHeight - 1;
 
-    if ( CompareMem(&oldPlace, &newPlace, sizeof(__typeof(oldPlace))) != 0 ) {
+    if ( CompareMem(&oldPlace, &newPlace, sizeof(__typeof__(oldPlace))) != 0 ) {
       Hide();
       Draw();
     }