Some fix up

Change-Id: Iacb8ae7d1c318d0584a7c223ad6ddb2f333872a5