Some minor debugging/trace output tweak

Change-Id: Ifde037689bb1cec66b591a92568b86e5da729249