Adding some things that need to be there for threading support