more fixes

Change-Id: Ib3b3796b52b75a21ced17667cabdf931de90b500