Refinements to self update code
Refinements to self update code (publish v1.43)