Minor design updates