Some more deployment changes