fix 2 (possible) memory leaks