New fix build patches