fixes to 125 and 137#142

GuyL99 wants to merge 2 commits into

mainblst-security/cherrybomb:mainfrom

fixes_to_137_129blst-security/cherrybomb:fixes_to_137_129Copy head branch name to clipboard