*think* that resolves problems with upgrade command - although had to jump through some hoops to get there