cleanup: small fixes mostly relating to kik and mithril/zorium