diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.c b/Projects/AVRISP-MKII/Lib/V2Protocol.c
index 035c8a5b39..096551d813 100644
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.c
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.c
@@ -43,6 +43,7 @@ uint32_t CurrentAddress;
 bool MustSetAddress;
 
 
+/** ISR to manage timeouts whilst processing a V2Protocol command */
 ISR(TIMER0_COMPA_vect, ISR_NOBLOCK)
 {
 	if (TimeoutMSRemaining)
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
index 7166c10239..e0400e2cc6 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -58,7 +58,7 @@
 	/* Defines: */
 		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
 			#define XPROG_VIA_HARDWARE_USART
-		#else		
+		#else
 			#define BITBANG_PDIDATA_PORT     PORTB
 			#define BITBANG_PDIDATA_DDR      DDRB
 			#define BITBANG_PDIDATA_PIN      PINB
@@ -81,7 +81,7 @@
 		#endif
 		
 		/** Serial carrier TPI/PDI speed when hardware TPI/PDI mode is used */
-		#define XPROG_HARDWARE_SPEED       500000
+		#define XPROG_HARDWARE_SPEED       1000000
 
 		/** Number of cycles between each clock when software USART mode is used */
 		#define BITS_BETWEEN_USART_CLOCKS  100
diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
index 44ca465de4..89afa5d48c 100644
--- a/Projects/AVRISP-MKII/makefile
+++ b/Projects/AVRISP-MKII/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
 # Target board (see library "Board Types" documentation, NONE for projects not requiring
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called 
 # "Board" inside the application directory.
-BOARD = XPLAIN
+BOARD = USBKEY
 
 
 # Processor frequency.