Minor fixes in QS