Minor design improvements