Some bugs related to the verbose/debug changes.