first fixes

Change-Id: Ic16a8f49b29c666631bede023a17ae85c9ac7714