Fix upgrade extraction