fixes to drive sync