Athletics fixes
Merge branch 'Oct-22-1132'