ZooHandle improvements and fixes