diff --git a/Source/portable/CCS4/MSP430X/port.c b/Source/portable/CCS4/MSP430X/port.c
index 0f21b920f4..f1bbc7bf06 100644
--- a/Source/portable/CCS4/MSP430X/port.c
+++ b/Source/portable/CCS4/MSP430X/port.c
@@ -126,7 +126,6 @@ unsigned long *pulTopOfStack;
 		pusTopOfStack--;
 		pulTopOfStack = ( unsigned long * ) pusTopOfStack;
 		*pulTopOfStack = ( unsigned long ) pxCode;
-		pusTopOfStack = ( unsigned short * ) pulTopOfStack;
 	}
 
 	pusTopOfStack--;
diff --git a/Source/portable/CCS4/MSP430X/portmacro.h b/Source/portable/CCS4/MSP430X/portmacro.h
index 20086f0bd1..b21c1eb368 100644
--- a/Source/portable/CCS4/MSP430X/portmacro.h
+++ b/Source/portable/CCS4/MSP430X/portmacro.h
@@ -114,7 +114,7 @@ extern volatile unsigned short usCriticalNesting;								\
 
 #define portEXIT_CRITICAL()														\
 {																				\
-extern volatile unsigned short usCriticalNesting;							\
+extern volatile unsigned short usCriticalNesting;								\
 																				\
 	if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING )					\
 	{																			\
@@ -141,10 +141,10 @@ extern void vPortYield( void );
 /*-----------------------------------------------------------*/
 
 /* Hardware specifics. */
-#define portBYTE_ALIGNMENT			4
+#define portBYTE_ALIGNMENT			2
 #define portSTACK_GROWTH			( -1 )
 #define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )	
-#define portNOP()	
+#define portNOP()					__no_operation()	
 /*-----------------------------------------------------------*/
 
 /* Task function macros as described on the FreeRTOS.org WEB site. */