! a couple of more upgrade bugs fixed, don't worry there are more

Signed-off-by: Spuds <spuds@spudsdesign.com>