Trivial static fixes for thread safety