Fixes for parallel  deploy