More OpenStack fixups