Recover coverage and add some missing bits