fixes

Change-Id: Ie8165bb969e4665d7cab4151b4feb60986800a09