Fixed updating issues