Fixed some further concurrent issues.