diff --git a/bacnet-stack/apdu.c b/bacnet-stack/apdu.c
index 4fdbe275..c2d9ec8e 100644
--- a/bacnet-stack/apdu.c
+++ b/bacnet-stack/apdu.c
@@ -69,7 +69,6 @@ void apdu_set_unrecognized_service_handler_handler(
 static unconfirmed_function 
 Unconfirmed_Function[MAX_BACNET_UNCONFIRMED_SERVICE] = 
 {
-    iam_handler,
     NULL
 };
 
diff --git a/bacnet-stack/tsm.h b/bacnet-stack/tsm.h
index 59620829..e65fcc25 100644
--- a/bacnet-stack/tsm.h
+++ b/bacnet-stack/tsm.h
@@ -39,6 +39,9 @@
 #include <stddef.h>
 #include "bacdef.h"
 
+/* note: TSM functionality is optional - only needed if we are 
+   doing client requests */
+#if TSM_ENABLED
 typedef enum
 {
   TSM_STATE_IDLE,
@@ -109,6 +112,11 @@ bool tsm_get_transaction_pdu(
   uint16_t *pdu_len);
 
 bool tsm_invoke_id_free(uint8_t invokeID);
+#else
+#define tsm_free_invoke_id(x) (void)x;
+
+
+#endif
 
 #ifdef __cplusplus
 }