fix upgrade path for UON code