Fixed few issues, extended logging

Change-Id: I6108f635c6ca330c7c9e8d00516a5de62b67a174