q2: Fixed buildq2: Fixed build