The deadlines were wrong all over the place, so this commit finally fixes that.
With selecting only the bare minimum we get much nicer performance.