Few fixes, additions after rebase

Change-Id: I6806754dec286dffd6791170e7aa41b28a38d994