diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 8215bbe8ed2ebf4ae2e3aba98d8b1b8f0573dc82..95463f7dcb3c840c932f25565cb9493bfff4f9df 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -9,7 +9,7 @@
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX
   *
   *  <b>New:</b>
-  *  - Added TPI programming support for 6-pin ATTINY devices to the AVRISP programmer project
+  *  - Added TPI programming support for 6-pin ATTINY devices to the AVRISP programmer project (thanks to Tom Light)
   *  - Added command timeout counter to the AVRISP project so that the device no longer freezes when incorrectly connected
   *    to a target
   *  - Added new TemperatureDataLogger application, a USB data logger which writes to the device's dataflash and appears to
diff --git a/Projects/AVRISP-MKII/AVRISP.h b/Projects/AVRISP-MKII/AVRISP.h
index d0f1e59271242e5b455c647649a2f45ecab8b30b..c9f3263ad8a13eaf2fae6b322216359c6b15099f 100644
--- a/Projects/AVRISP-MKII/AVRISP.h
+++ b/Projects/AVRISP-MKII/AVRISP.h
@@ -72,11 +72,10 @@
 
 	/* Function Prototypes: */
 		void SetupHardware(void);
-
+		void Process_AVRISP_Commands(void);
+		
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-
-		void Process_AVRISP_Commands(void);
 		
 #endif
diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h
index 5af9fe9bfe30ed5b9e3af1c2dd6d9f0d2d98b900..d67fb3dada62c344fb5d1b2a6a48c8178c70a245 100644
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -82,9 +82,9 @@
 		void V2Protocol_ProcessCommand(void);
 		
 		#if defined(INCLUDE_FROM_V2PROTOCOL_C)
-			static void V2Protocol_UnknownCommand(uint8_t V2Command);
+			static void V2Protocol_UnknownCommand(const uint8_t V2Command);
 			static void V2Protocol_SignOn(void);
-			static void V2Protocol_GetSetParam(uint8_t V2Command);
+			static void V2Protocol_GetSetParam(const uint8_t V2Command);
 			static void V2Protocol_ResetProtection(void);
 			static void V2Protocol_LoadAddress(void);
 		#endif
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
index e7513032f6089dc3bf2920f68c88d4ac41fc9a5b..4ed3da75d94f443c541b1a3bbfd0626b8f429096 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
@@ -53,7 +53,7 @@ static void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress)
  *
  *  \param[in] Address  6-bit I/O address to write to in the target's I/O memory space
  */
-static void TINYNVM_SendReadNVMRegister(uint8_t Address)
+static void TINYNVM_SendReadNVMRegister(const uint8_t Address)
 {
 	/* The TPI command for reading from the I/O space uses strange addressing, where the I/O address's upper
 	 * two bits of the 6-bit address are shifted left once */
@@ -64,7 +64,7 @@ static void TINYNVM_SendReadNVMRegister(uint8_t Address)
  *
  *  \param[in] Address  6-bit I/O address to read from in the target's I/O memory space
  */
-static void TINYNVM_SendWriteNVMRegister(uint8_t Address)
+static void TINYNVM_SendWriteNVMRegister(const uint8_t Address)
 {
 	/* The TPI command for writing to the I/O space uses wierd addressing, where the I/O address's upper
 	 * two bits of the 6-bit address are shifted left once */
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h
index 546e5abaa0ff8596d78d8300f5ae23c751e65c83..5a18567cba70616bc1443b5bc57f04cf697df6bf 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h
@@ -68,8 +68,8 @@
 		bool TINYNVM_EraseMemory(void);
 
 		#if defined(INCLUDE_FROM_TINYNVM_C)
-			static void TINYNVM_SendReadNVMRegister(uint8_t Address);
-			static void TINYNVM_SendWriteNVMRegister(uint8_t Address);
+			static void TINYNVM_SendReadNVMRegister(const uint8_t Address);
+			static void TINYNVM_SendWriteNVMRegister(const uint8_t Address);
 			static void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress);
 		#endif