+ more fixes of YM deps