Bug fixing Q2 and Q3