Some fixes from Alban