Minor fixes. Entire pipeline runs as expected