Small fixes for Deployment.
Merge pull request #995 from sylus/7.x-1.x

Small fixes for Deployment.