More small code/thread fixes

Adrien requested to merge aby-tsan-fixes into master Jun 11, 2018