A few minor adjustments