More Coverall fixes