OpenStack fixes