Tweaked logging and investigator endpoint code