More changes to try and get coverall working