rest of the fixes

Change-Id: I63a79719ea616502e9aa59e78bad503ce77ee877