Better handling of cyrkeys