fix bugs with respect to recent Deployment model changes
2 files changed