Minor design tuning.