Autodeployment improvements