Additions and polish to self healing deployment