Fixes for new deployment stategy.