Some fine-tuning on the version checking