more fixes

Change-Id: I13267096d82bae03590eb53e1ca150f863eb93fc