Deployment fixes

![Chuck_Norris](https://f.cloud.github.com/assets/705860/147506/4dfa4184-74b7-11e2-9035-45a3b62e7c65.jpeg)