GQSS-862 Tweaks.