Fixing thread safety & abort interlocks