More progress on coverage stuff