Some more fixmes
Brain-dead threading