Fixes for OpenStack