Key Distribution, Fix 'is' comparisons