Leak fixes, debug disabled