Fixed more threading issues