Fixes for web services