Logging fixes

Change-Id: I65d0414f80364e522b197f3ed72500b73873874c