Deployment enhancements
Several fixes/improvements