Fixes to contribution flow