Minor design modifications