- More specialized SyncHandlers for performance
- Various fixups