Fix little inattentions in recent changes (PEBKAC !)