Some changes before merging in a new face detector