Mem leaks from previous plugin fixed.