Minor cleanup for debug module