fix several problem

Change-Id: Ib5798fec3a4d37e2e152fe42b62916e03205c8f6