Build fixups for d19c8c47082f