Bug fixes in QoS