more fixes

Change-Id: I1cb17aa2cafd51fad4c424773b8470c4adc9ec7d