Support some simple upgrade cases now