more fixes for clip sync