Make some minor adjustments