Minor debugging changes