Another build fix attempt