General fixes in Extended QS

Change-Id: I992ca27632b2d106dfa1b903fda08afe7a49b9ea