Preparations for moving to ThreadPoolExecutors