Bugfixes for Keystone and Nova installs