Fix upgrade path