Improve xpub checking