Minor tweaks to Fabrice's patch