more fixes

Change-Id: If96b3f2569e7f90f4ccf1f9aa29ee8a13a0c44a9