Fixes around concurrent stuff