[BUGFIX] FIx issues with yetorm