Some q3 client modifications.