Fixed 2 memory leaks!