fix more

Change-Id: I4c4a511f59446bbb97a60203475140052a92bec8