fix for more minor memory leaks