Adding Q2 bug fixes