Minor debugging changes
TODO