Minor design corrections