Few more deployment changes/fixes