Fix version detection, re-order v3 tasks