MANTA-20 minor debug output fixes