more adjustments

Change-Id: I7b818a8d59898b6415277c3381e21b445e9e7fdf