some fixes

Change-Id: I607793c0e221adc325ced2a0afaf1a45c3045449