Fix Yuga and Odin builds