code fixes after adding Rackspace support