Fix build issues from my last PR (oops!)#17

alii merged 2 commits intoscopeclient:mainscopeclient/scope:mainfrom

roobscoob:mainroobscoob/scope:mainCopy head branch name to clipboard