Minor fix and additions

Change-Id: I3aa64c2c13ea0e73f0f28ccb34a463a3c37ffdb0