more fixes

Change-Id: I0ab05d1a3283926ae61184a51e74cb98dc4005a1