Fixed incorrect internal variables for deprecated options