Add some thread-safety.