more fixes

Change-Id: I1ab72f06ffba0fec47496a732dca1fa5728317a2
more fixes

Change-Id: I8b4cd51b4142ef679d4f0bb6e9dd476dca73ac9a