Improve some coverage.