Tweaks to de-clutter debugging