Cleanup to fix coverage stats