fixing issues
Merge branch 'atlas_production' of https://github.com/aen-tech/atlas_claims into atlas_production