some sync improvements