Fix pipeline fails