PQS fixes and updates for config changes.