Fixes Small Issues for #902

SCEditor
Merge pull request #1097 from ATofighi/fix-902

Fixes Small Issues for #902