Add some minor adjustments