Brought in improvements from other projects.