Athletics Fixes
Merge branch 'Sep-4-0900'