Few fixes from Ludo