Misc fixes

Some fixes for NFV found during devstack testing.