Debug statement tweaks