More enhancements to auto-install on Ubuntu