Fix options interface (How embarrassing)