some small updates

Change-Id: I12f38756d69e89c9d74b40fca7b9e14e68457487