Some improvements from elbeuf experience