pipestage2 further syntax check bugfixes