WIP: Fix 3.3 error and memory leak.