Better handling of explicit package upgrade