Merge "Add some missing dlclose(.)"