More tweaks to debugging section