TQB fixes