Some features adjustments