More attempts to fix build error.