Changes to make cobertura report work