Fix setfield (sets aren't supported by the datastore)
Patch update_contenttypes so that it's less likely to fail due to eventual consistency
Slight tweak to bulk inserts