Make a few minor adjustments