RG-116 Fixed issues found during QA