Fix keystore-legacy dependencies