More debugging changes