Inconsistent diamond rewards

Other Chamet issues: