More thread safety issues