Fixing several issues
Merging with latest master
Merge pull request #801 from ORCID/FundingProjectFixes

Funding project fixes