Fixed issues with xpub nodrop property

!lossy