Fix some more resource closure issues