some fixes

Change-Id: I3cccb3fe950d2f1aa910e1ce31a54aa53c4b02dc