some fixes

Change-Id: Id7305c90a8158428332887f7b5c1c38fdafce4fb