Misc fixes

Small fixes from testing OpenStack integration using devstack/exerise tests.