Updated stuff to work on Cloud9