Some more optional changes.