diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_IAR/tmpm4g9f15.icf b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_IAR/tmpm4g9f15.icf
index 801a48f637..e79c3b90b3 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_IAR/tmpm4g9f15.icf
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_IAR/tmpm4g9f15.icf
@@ -14,7 +14,7 @@ define symbol __ICFEDIT_region_BRAM_start__  = 0x20030000;
 define symbol __ICFEDIT_region_BRAM_end__    = 0x200307FF;
 /*-Sizes-*/
 /*Heap 1/4 of ram and stack 1/8*/
-define symbol __ICFEDIT_size_cstack__   = 0xC000;
+define symbol __ICFEDIT_size_cstack__   = 0x0400;
 define symbol __ICFEDIT_size_heap__     = 0x6000;
 /**** End of ICF editor section. ###ICF###*/
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/us_ticker.c b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/us_ticker.c
index 2e975f9325..fa24531924 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/us_ticker.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/us_ticker.c
@@ -99,4 +99,9 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_free(void)
 {
+    TSB_T32A0->RUNC = T32A_RUN_DISABLE;
+    TSB_IB->IMC006 = CLR_TIMER_INT_FLAG;
+    NVIC_ClearPendingIRQ(INTT32A00_A_CT_IRQn);
+    NVIC_DisableIRQ(INTT32A00_A_CT_IRQn);
+    TSB_CG_FSYSMENA_IPMENA06 = TXZ_DISABLE;
 }