Fix a few concurrency bugs found during airpair interview

Signed-off-by: Alex Jackson <ajackson@pivotallabs.com>