Few more adjustments