Changes to get scripts ready for wps4r.