Final config changes