Fix advanced settings build pt2