Small debugging mods