Fixed misc leaks