diff --git a/plugins/include/bitbuffer.inc b/plugins/include/bitbuffer.inc
index db7cd4ec..c9732d07 100644
--- a/plugins/include/bitbuffer.inc
+++ b/plugins/include/bitbuffer.inc
@@ -229,11 +229,11 @@ native Float:BfReadFloat(Handle:bf);
  * @param bf			bf_read handle to read from.
  * @param buffer		Destination string buffer.
  * @param maxlength		Maximum length of output string buffer.
- * @param Line			If true the buffer will be copied until it reaches a '\n' or a null terminator.
+ * @param line			If true the buffer will be copied until it reaches a '\n' or a null terminator.
  * @noreturn
  * @error				Invalid or incorrect Handle, destination string buffer was too short.
  */
-native BfReadString(Handle:bf, String:buffer[], maxlength, bool:Line=false);
+native BfReadString(Handle:bf, String:buffer[], maxlength, bool:line=false);
 
 /**
  * Reads an entity from a readable bitbuffer (bf_read).
diff --git a/plugins/include/timers.inc b/plugins/include/timers.inc
index 58dd6944..ce920395 100644
--- a/plugins/include/timers.inc
+++ b/plugins/include/timers.inc
@@ -46,7 +46,7 @@ funcenum Timer
  	 * @return				Plugin_Stop to stop a repeating timer, any other value for
  	 *						default behavior.
  	 */
-	Action:public(Handle:timer, value),
+	Action:public(Handle:timer, any:value),
 	
 	/**
  	 * Called when the timer interval has elapsed.
@@ -67,7 +67,7 @@ funcenum Timer
  * @param flags				Flags to set (such as repeatability or auto-Handle closing).
  * @return					Handle to the timer object.  You do not need to call CloseHandle().
  */
-native Handle:CreateTimer(Float:interval, Timer:func, {Handle,_}:value=INVALID_HANDLE, flags=0);
+native Handle:CreateTimer(Float:interval, Timer:func, any:value=INVALID_HANDLE, flags=0);
 
 /**
  * Kills a timer.  Use this instead of CloseHandle() if you need more options.
@@ -99,7 +99,7 @@ native TriggerTimer(Handle:timer, bool:reset=false);
  * @param flags				Timer flags.
  * @return					Handle to the timer object.  You do not need to call CloseHandle().
  */
-stock Handle:CreateDataTimer(Float:interval, Timer:func, &Handle:data, flags)
+stock Handle:CreateDataTimer(Float:interval, Timer:func, &Handle:data, flags=0)
 {
 	data = CreateDataPack();
 	flags |= TIMER_HNDL_CLOSE;
diff --git a/plugins/include/usermessages.inc b/plugins/include/usermessages.inc
index 6acca67f..c7677115 100644
--- a/plugins/include/usermessages.inc
+++ b/plugins/include/usermessages.inc
@@ -26,10 +26,13 @@ enum UserMsg
 	INVALID_MESSAGE_ID = -1,
 };
 
-#define USERMSG_PASSTHRU		(1<<0)		/**< Message will pass through other SourceMM plugins */
-#define USERMSG_PASSTHRU_ALL	(1<<1)		/**< Message will pass through other SourceMM plugins AND SourceMod */
-#define USERMSG_RELIABLE		(1<<2)		/**< Message will be set to reliable */
+#define USERMSG_PASSTHRU		(1<<0)		/**< (DEPRECATED, NO EFFECT) */
+#define USERMSG_PASSTHRU_ALL	(1<<1)		/**< (DEPRECATED, NO EFFECT) */
+#define USERMSG_RELIABLE		(1<<2)		/**< Message will be set on the reliable stream */
 #define USERMSG_INITMSG			(1<<3)		/**< Message will be considered to be an initmsg */
+#define USERMSG_BLOCK_MM		(1<<4)		/**< Message will be blocked from going through MM:S hooks */
+#define USERMSG_BLOCK_SM		(1<<5)		/**< Message will be blocked from going through SourceMod hooks */
+#define USERMSG_BLOCK_ALL		(1<<6)		/**< Message will be blocked from going through any hooks */
 
 /**
  * Returns the ID of a given message, or -1 on failure.