More pipeline config fixes and improvements