More improved debugging