More build fix work