merge MrPerson's qdel fixes