(NGC) Some build fixes