ZVISION: Plug more memory leaks