more fixes

Change-Id: I308f36c72aa5b55355da4730b65b71b78ba9e8d5