Fix references to options