Fixing things Aymeric broke