Fixes from Franck