Fixes for new QS

A bunch of small cleanup for the new QS.

Change-Id: If0a5efe67366a4288f72cb91d32f5e20a4d4d6ca
Test: visual
Fixes: 34665057
Fixes: 34658107
Fixes: 34644473
7 files changed