Fix compilation with Tundra post-TundraCore