Minor cleanup of debug info