fix two data race conditions

Summary: caught from go test -race

Test Plan: go test -race ./...

Reviewers: joy

Reviewed By: joy

CC: Engineering

Differential Revision: https://phabricator.poptip.com/D2911