Fixes in high goal tracking.