Fix amplab q2