Improve logging

Change-Id: I03aa3e82d80a8fb5c70a2881762b30f1b9b71bfb