Fix things with Q5