fixes

Change-Id: Ia9786a5bf534b96751c1a2c6e9002df70446f652