Yet more debuggin outputs cleanups