some fixes on yeti