Fixes needed now that funding sources are

in their own table