Warning Fixes (Athletics)