trunk: fix some fd-leaks