sync mode fixes