Did some of the SQA fixes
Did some SQA fixes