Fixes and slight changes in WPS-T schemas