Claim fixes and improvements to process.