Fixing some pipeline errors