Fix issue w/ CLAIMS_MAP
Merge in master