Thread-Fixes