Minor tweaks while debugging...