Small modifications on web-sync