Small adjustments on settings