Improved logging a bit

Change-Id: Ib93fc9b3ba4bcac0b5213f77e3612ea458e0f438