Final imports fix by @MartijnPieters (+ I join the client thread)