[FEATURE] KYC: Minor improvements