Related card fixes