Jacoco fixes