Fixed q/qu issues