Better handle some of the debug output that gets generated