Small fixes suggested by Amanieu