diff --git a/targets/esp8266/i2c_master.c b/targets/esp8266/i2c_master.c
index 004b82662..c82cc770d 100644
--- a/targets/esp8266/i2c_master.c
+++ b/targets/esp8266/i2c_master.c
@@ -73,10 +73,10 @@ i2c_master_setDC(uint8 SDA, uint8 SCL)
     m_nLastSCL = SCL;
 
     //I2C_MASTER_SDA_SCL(SDA, SCL);
-    GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, SDA<<pinSDA);
-    GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, (SDA^1)<<pinSDA);
-    GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, SCL<<pinSCL);
-    GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, (SCL^1)<<pinSCL);
+    if (SDA) GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, 1<<pinSDA);
+    else     GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, 1<<pinSDA);
+    if (SCL) GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, 1<<pinSCL);
+    else     GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, 1<<pinSCL);
 
 }
 
diff --git a/targets/esp8266/jshardware.c b/targets/esp8266/jshardware.c
index 0fd69886e..25b88b3eb 100644
--- a/targets/esp8266/jshardware.c
+++ b/targets/esp8266/jshardware.c
@@ -436,8 +436,8 @@ void jshPinSetValue(
     bool value //!< The new value of the pin.
   ) {
   //os_printf("> ESP8266: jshPinSetValue pin=%d, value=%d\n", pin, value);
-  GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, (value&1)<<pin);
-  GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, (!value)<<pin);
+  if (value & 1) GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, 1<<pin);
+  else           GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, 1<<pin);
   //jshDebugPin(pin);
 }
 
@@ -1145,12 +1145,12 @@ unsigned int jshGetRandomNumber() {
 /**
  * Determine available flash depending on EEprom size
  *
- */  
+ */
 uint32_t jshFlashMax() {
-  extern uint16_t espFlashKB; 
+  extern uint16_t espFlashKB;
   return 1024*espFlashKB;
 }
-  
+
 /**
  * Read data from flash memory into the buffer.
  *