Fix rollback issues