Fixes from @anphorea

Master and WebWorks-2.0 should be kept in sync now.