A couple of patches that helped me to play a bit with yami