Minor updates

Change-Id: I0c76e734cbb15c5f36bddf54ef6df9fddfa14a5c