Minor design revisions