Fix issue with anonymous empty objects in JSON serializer
Fix threading issue in Scheduler