Some more restored changes after losing local data