Small debugging changes