Bug fixes after thread pool change.