Better rollback handling