Fox model fixes