Merge pull request #487 from Verdagon/master

Fixing build breakages

Merge pull request #394 from Verdagon/master

Made scope tethers crash instead of using the undead cycle.