Claimant fixes merge into changing models