Fix a couple defered Close() operations