diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index 3767672942..15c5c48c38 100644
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -566,7 +566,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(_In_ sw
 																		 _Inout_opt_ switch_memory_pool_t **pool, _In_opt_z_ const char *use_uuid);
 #define switch_core_session_request(_ep, _d, _p) switch_core_session_request_uuid(_ep, _d, _p, NULL)
 
-SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(switch_core_session_t *session, const char *use_uuid);
+SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(_In_ switch_core_session_t *session, _In_z_ const char *use_uuid);
 
 SWITCH_DECLARE(void) switch_core_session_perform_destroy(_Inout_ switch_core_session_t **session,
 														 _In_z_ const char *file, _In_z_ const char *func, _In_ int line);
@@ -584,7 +584,7 @@ SWITCH_DECLARE(void) switch_core_session_perform_destroy(_Inout_ switch_core_ses
 */
 SWITCH_DECLARE(uint32_t) switch_core_session_count(void);
 
-SWITCH_DECLARE(switch_size_t) switch_core_session_get_id(switch_core_session_t *session);
+SWITCH_DECLARE(switch_size_t) switch_core_session_get_id(_In_ switch_core_session_t *session);
 
 /*! 
   \brief Provide the current session_id
diff --git a/src/switch_core.c b/src/switch_core.c
index 4ef0313d0c..280c44ca33 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -298,8 +298,8 @@ static void *switch_core_service_thread(switch_thread_t *thread, void *obj)
 	switch_channel_t *channel;
 	switch_frame_t *read_frame;
 
-	switch_assert(thread != NULL);
-	switch_assert(session != NULL);
+//	switch_assert(thread != NULL);
+//	switch_assert(session != NULL);
 
 	if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
 		return NULL;