Various pipeline edits