Pipeline op fix + additional assertion

Notice `FIXME`s in the code.