JF: Some changes

Change-Id: I2a07ece2cffdad1187e33053f58978a034551e1c