diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/TOOLCHAIN_ARM_STD/sys.cpp b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/TOOLCHAIN_ARM_STD/sys.cpp
index 2f1024ace8..ad00bc43c9 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/TOOLCHAIN_ARM_STD/sys.cpp
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/TOOLCHAIN_ARM_STD/sys.cpp
@@ -11,6 +11,7 @@ extern "C" {
 
 #include <rt_misc.h>
 #include <stdint.h>
+#include "sys_helper.h"
 
 extern char Image$$RW_IRAM1$$ZI$$Limit[];
 
@@ -22,7 +23,7 @@ extern __value_in_regs struct __initial_stackheap __user_setup_stackheap(uint32_
 
     struct __initial_stackheap r;
     r.heap_base = zi_limit;
-    r.heap_limit = sp_limit;
+    r.heap_limit = sp_limit - __reserved_stack_size();
     return r;
 }
 
diff --git a/workspace_tools/export/uvision4_lpc4088.uvopt.tmpl b/workspace_tools/export/uvision4_lpc4088.uvopt.tmpl
index 77400b267c..542903f60d 100644
--- a/workspace_tools/export/uvision4_lpc4088.uvopt.tmpl
+++ b/workspace_tools/export/uvision4_lpc4088.uvopt.tmpl
@@ -21,7 +21,7 @@
   </DaveTm>
 
   <Target>
-    <TargetName>mbed NXP LPC1768</TargetName>
+    <TargetName>mbed NXP LPC4088</TargetName>
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>