Fixes suggested by Fabien.
Some of Fabien's "fixes" "break".