Ziziphus latest fixes/cleanups