More Athletic Fixes
Merge branch 'Sep-3-1135'