Fixed McMillan and traces for Q1