More fixes and Zukiwi.