Add tweaks by Jacques Distler.