few fixes

Change-Id: I6634166e609f76e9d62848ebe5b4d847f8ecc849