Improved handling of coverage import