Minor changes and fixes on Q2 and Q3