Athletics fixes
Merge branch 'athletics'