Upgrade kodo and fifi