Fix for remote and local code coverage