Fix issues

Change-Id: Ifbc3478349e2ff2316605394dca647a92299ec07