fixes for a few sync bugs