and some more fixing

Change-Id: Icdaa7ea471b38aabe7bcb0f2ced2f1d9535e96da