Some deployment changes