(NGC) Build fixes