Claim Code fixes that should have already gone