Bug fixes (log messages).

Change-Id: I0674ff703a16764d3e837a0851ea1e5794a624d2