* Fix ZQuest support