fixes to rollback logic (VBAT-65)