Fixed some more bugs with upgrade detection
Removed some left over warns