some fixes

Change-Id: Ic0c2bfa938a26ba886d19507006f6867c3e53af7