Tweaks for more debugging ...