more fixes

Change-Id: Ic8668ff1e321f7d3bef5478c6a1fec281f328637