Try to fix another possible source leaks