Fix critical bugs and enhance security#8

Eashan-H wants to merge 1 commit intotheochem:maintheochem/ffprime:mainfrom

Eashan-H:minor-fixesEashan-H/ffprime:minor-fixesCopy head branch name to clipboard