Fixes suggested by Bertrand