Minor changes, Fixed possible Zone memory leak