Debugging fixes by Sahara#10

Sahara2003 wants to merge 2 commits into

codezelaca:maincodezelaca/fs-se-debugging-bugs:mainfrom

Sahara2003:mainSahara2003/fs-se-debugging-bugs:mainCopy head branch name to clipboard