Got rid of the last of the qb_abort() calls