different problems fixed

Change-Id: Idcb16d84ec831af6c3ce85559b538671f48babb5