diff --git a/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde b/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde
index d514215..f755d9c 100644
--- a/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde
+++ b/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde
@@ -1,6 +1,6 @@
 #include <LiquidCrystal.h>
 
-LiquidCrystal lcd(12, 11, 2, 7, 8, 9, 10);
+LiquidCrystal lcd(12, 11, 10, 5, 4, 3, 2);
 
 void setup()
 {
diff --git a/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde b/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde
index c1f405a..6e4336c 100644
--- a/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde
+++ b/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde
@@ -1,6 +1,6 @@
 #include <LiquidCrystal.h>
 
-LiquidCrystal lcd(12, 11, 2, 7, 8, 9, 10);
+LiquidCrystal lcd(12, 11, 10, 5, 4, 3, 2);
 
 void setup()
 {
diff --git a/libraries/Servo/Servo.cpp b/libraries/Servo/Servo.cpp
index 4d04145..248a215 100755
--- a/libraries/Servo/Servo.cpp
+++ b/libraries/Servo/Servo.cpp
@@ -69,12 +69,12 @@ uint8_t Servo::attach(int pinArg)
 
   if (pin == 9) {
     attached9 = 1;
-    TCCR1A = TCCR1A & ~_BV(COM1A0) | _BV(COM1A1);
+    TCCR1A = (TCCR1A & ~_BV(COM1A0)) | _BV(COM1A1);
   }
   
   if (pin == 10) {
     attached10 = 1;
-    TCCR1A = TCCR1A & ~_BV(COM1B0) | _BV(COM1B1);
+    TCCR1A = (TCCR1A & ~_BV(COM1B0)) | _BV(COM1B1);
   }
   return 1;
 }