Fixed a few bugs for the sake of Rackspace's implementation of OpenStack