Make how to handle debug msgs consistent