Minor option changes.