Fixing some issues with web services