fixes

Change-Id: Ie6f071ea6636a1b9e89037eeb2aecd466e03af2c