small updates from Erik

Change-Id: I736cb47c722ac399da3d331f9e530e8bfad004a8