Fixes to Web Services Module