Make getting version more robust