More fixups

Fails because of novaclient confusion.