Yet again more changes for coverall