Fixed some synchronization in join