More debugging changes.