Fix pipeline problems