Unreviewed, non-unified build fixes after 250693@main