Fix rcov and nats per pull request discussion.