Card init fixes