deal with more data races

Summary: Two more data races found and sqaushed by the go race detector.

Test Plan: manual. go testrace

Reviewers: spencerkimball

Reviewed By: spencerkimball

Subscribers: team

Differential Revision: http://phabricator.andybons.com/D52