Add Benoit's fixes.