Minor design adjustments