Fixes from Sylvain