fix problems with initial sync