Harden security and fix code quality issues#2

jszobody merged 1 commit intomainstechstudio/keep:mainfrom

code-quality-auditstechstudio/keep:code-quality-auditCopy head branch name to clipboard