Fix bugs in cover cleanup