Additional fixes for Datacard Creation; now works with combine