fix race detector errors
Merge branch 'barnacle'