more fixes

Change-Id: I8dae1b2cbdf4984d4a8a9665bfc2ef32978cbb9e