QS: some fix