Some minor adjustments