Coverall fixes