Attempt to address suspected memory leaks