Handle out of sync situations better