Minor design nits