Some minor debugging work