Fix pipeline stuff