1st fixes

Change-Id: I5bc6f3a09088dd86d72a9343646c79715f1eb826