Fix some auto add options.