Spyglass patches

Blocks some more "hacks" :trollface:
Eh, spyglass
Fuuu Spyglass
Merge branch 'master' into westerland2