Fixes errors building for js.
Merge branch 'master' of github.com:wilkie/omgwtfadd