Unified version checks where appropriate
10 files changed