Fix pipeline issues