Fixed q2 references