Minor tweaks and fixes
Minor debugging tweaks before we start accepting data