Fixed metrics that were incorrect

Resolves #252. Thanks for the heads up, @martinsumner.