fixes

Change-Id: If3ffdca093984b2e19b05757374b5b1b5670f947