Added omitted changes.