Required fixes for ccda-generator export functionality

These fixes need to be in master and in the latest release in order for ccda-generator download functionality to work.