more fixes

Change-Id: I8563daa39d037c6b9160d787971de023b8febce2