fix errors.
Merge pull request #218 from anphorea/WebWorks-2.0

fix errors.
Merge pull request #219 from timwindsor/master

Fixes from @anphorea