Fixes for building the cinder image