Minor fixes

Change-Id: I1f695497ace6c191fea6fbfe8df2d7738823997b