Small fixes

A few small things I came across while hacking on OpenStack support.