Reimplemented some missing changes.