Fix pcode boundary reference + fix the pcode tag inclusion