diff --git a/libcpu/arm/cortex-m4/context_rvds.S b/libcpu/arm/cortex-m4/context_rvds.S
index d7cb34d5c33dd6de3c11dd049d656fe1bcf5b5b5..fa7a1c90f8de443f5c2464a1d1514f02115ba0c6 100644
--- a/libcpu/arm/cortex-m4/context_rvds.S
+++ b/libcpu/arm/cortex-m4/context_rvds.S
@@ -205,7 +205,6 @@ rt_hw_context_switch_to    PROC
     LDR     r0, =SCB_VTOR
     LDR     r0, [r0]
     LDR     r0, [r0]
-    NOP
     MSR     msp, r0
 
     ; enable interrupts at processor level
diff --git a/tools/keil.py b/tools/keil.py
index 16fc0d1fc5ad5d74602f5c0073899796b1e57c13..4cf07a0741d06665bfde94606e22f3adfe7a43ca 100644
--- a/tools/keil.py
+++ b/tools/keil.py
@@ -75,6 +75,8 @@ def MDK4AddGroupForFN(ProjectFiles, parent, name, filename, project_path):
         obj_name = name.replace('.s', '.o')
     elif name.find('.S') != -1:
         obj_name = name.replace('.s', '.o')
+    else:
+        obj_name = name
 
     if ProjectFiles.count(obj_name):
         name = basename + '_' + name
@@ -272,6 +274,8 @@ def MDK5AddGroup(ProjectFiles, parent, name, files, project_path):
             obj_name = name.replace('.s', '.o')
         elif name.find('.S') != -1:
             obj_name = name.replace('.s', '.o')
+        else:
+            obj_name = name
 
         if ProjectFiles.count(obj_name):
             name = basename + '_' + name