QS: fixes for 4.4.2