Last minute changes before sync