Last fixes

Change-Id: Iba3ca755aafd2f1662f487b8966db9f0bf2cbe5e