Changes, as per legoktm's code review

Change-Id: I6494b6e61db891c47eaf8f75580d02b548d614db