Update files to build succesfully for Yuga & Odin