Manon/Paul fixes