Massage bugs out of XFlow