Tiny enhancement/integration to wmscripts