WIP
Fix some web service bugs