Improved logging

Change-Id: Idc7bec971c11fe7505fd1dca199f6df72b9af3ba