Some card fixes