Debugging tweaks, round 1

More to come