Corrections after code review

Change-Id: I9c6ee6dc0cbf63e3b5d25b1a3a5743f216170000