Added coverage.
Fixed perf.