Some fixes to forced upgrade messaging