Fixes from reviews

Change-Id: I6023e69b5fd72620cd8a3cf145d57a9319a80b9d