QS: Some bugfix