Fixing and simplifying coverage targets