more timing race fixes

Signed-off-by: Chris Wang <cwang@pivotallabs.com>