Fix: correct PC and Q6 compilation