Minor cleanup.
Merge branch 'develop' of github.com:jimv39/qvcsos into develop