Missing changes from the last commits.