The threading module can't use the magic macros anymore
Fix small bugs in threading
Fix convolution timer, again