diff --git a/Lib/CMakeLists.txt b/Lib/CMakeLists.txt
index 184aeebf0..85de99864 100644
--- a/Lib/CMakeLists.txt
+++ b/Lib/CMakeLists.txt
@@ -15,5 +15,5 @@ if( RAKNET_ENABLE_DLL )
 	add_subdirectory(DLL)
 endif()
 
-FILE(GLOB ALL_HEADER_SRCS ${RakNet_SOURCE_DIR}/Source/*.h)
-INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION ${CMAKE_PREFIX_PATH}/include/raknet)
\ No newline at end of file
+file(GLOB ALL_HEADER_SRCS ${RakNet_SOURCE_DIR}/Source/*.h)
+install(FILES ${ALL_HEADER_SRCS} DESTINATION include/RakNet)
diff --git a/Lib/DLL/CMakeLists.txt b/Lib/DLL/CMakeLists.txt
index a64464926..4f6b2d698 100644
--- a/Lib/DLL/CMakeLists.txt
+++ b/Lib/DLL/CMakeLists.txt
@@ -21,6 +21,6 @@ ELSE(WIN32 AND NOT UNIX)
 ENDIF(WIN32 AND NOT UNIX)
 
 install(TARGETS RakNetDLL 
-        RUNTIME DESTINATION ${CMAKE_PREFIX_PATH}/bin
-        ARCHIVE DESTINATION ${CMAKE_PREFIX_PATH}/lib
-    )
\ No newline at end of file
+        RUNTIME DESTINATION bin
+        ARCHIVE DESTINATION lib
+    )
diff --git a/Lib/LibStatic/CMakeLists.txt b/Lib/LibStatic/CMakeLists.txt
index 859414627..dcf7e14c9 100644
--- a/Lib/LibStatic/CMakeLists.txt
+++ b/Lib/LibStatic/CMakeLists.txt
@@ -31,5 +31,5 @@ ELSE(WIN32 AND NOT UNIX)
 ENDIF(WIN32 AND NOT UNIX)
 
 install(TARGETS RakNetLibStatic 
-        ARCHIVE DESTINATION ${CMAKE_PREFIX_PATH}/lib
+        ARCHIVE DESTINATION lib
     )
diff --git a/Source/CCRakNetSlidingWindow.cpp b/Source/CCRakNetSlidingWindow.cpp
index d8c25d3d6..0a8ba8416 100644
--- a/Source/CCRakNetSlidingWindow.cpp
+++ b/Source/CCRakNetSlidingWindow.cpp
@@ -198,11 +198,11 @@ void CCRakNetSlidingWindow::OnNAK(CCTimeType curTime, DatagramSequenceNumberType
 	}
 }
 // ----------------------------------------------------------------------------------------------------------------------------
-void CCRakNetSlidingWindow::OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBAndAS, BytesPerMicrosecond _BB, BytesPerMicrosecond _AS, double totalUserDataBytesAcked, bool isContinuousSend, DatagramSequenceNumberType sequenceNumber )
+void CCRakNetSlidingWindow::OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBAndAS, BytesPerMicrosecond b, BytesPerMicrosecond as, double totalUserDataBytesAcked, bool isContinuousSend, DatagramSequenceNumberType sequenceNumber )
 {
-	(void) _BB;
+	(void) b;
 	(void) totalUserDataBytesAcked;
-	(void) _AS;
+	(void) as;
 	(void) hasBAndAS;
 	(void) curTime;
 	(void) rtt;
diff --git a/Source/CCRakNetSlidingWindow.h b/Source/CCRakNetSlidingWindow.h
index 9fe7a6371..ddc02b5e7 100644
--- a/Source/CCRakNetSlidingWindow.h
+++ b/Source/CCRakNetSlidingWindow.h
@@ -129,12 +129,12 @@ class CCRakNetSlidingWindow
 	/// hasBAndAS are possibly written with the ack, see OnSendAck()
 	/// B and AS are used in the calculations in UpdateWindowSizeAndAckOnAckPerSyn
 	/// B and AS are updated at most once per SYN 
-	void OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBAndAS, BytesPerMicrosecond _BB, BytesPerMicrosecond _AS, double totalUserDataBytesAcked, bool isContinuousSend, DatagramSequenceNumberType sequenceNumber );
+	void OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBAndAS, BytesPerMicrosecond b, BytesPerMicrosecond as, double totalUserDataBytesAcked, bool isContinuousSend, DatagramSequenceNumberType sequenceNumber );
 	void OnDuplicateAck( CCTimeType curTime, DatagramSequenceNumberType sequenceNumber );
 	
 	/// Call when you send an ack, to see if the ack should have the B and AS parameters transmitted
 	/// Call before calling OnSendAck()
-	void OnSendAckGetBAndAS(CCTimeType curTime, bool *hasBAndAS, BytesPerMicrosecond *_BB, BytesPerMicrosecond *_AS);
+	void OnSendAckGetBAndAS(CCTimeType curTime, bool *hasBAndAS, BytesPerMicrosecond *b, BytesPerMicrosecond *as);
 
 	/// Call when we send an ack, to write B and AS if needed
 	/// B and AS are only written once per SYN, to prevent slow calculations