Fixes suggested by Diaoul