ClientScripting fixes
Merge pull request #822 from TheUnknownOne/master

ClientScripting fixes