Minor changes to DEBUG()'s