VANITY-6: fix dependencies and fix API changes