Gold end-of-day: fix errors with calculating goal