minor improvements to upgrade autodetection and messages