[Build] Updated build defs. Thanks to Rochet for pointing