Bug 1027453 - Deployment fixes