Few minor adjustments