More options changes.