Some options fix