Fixes:
- InvalidClassException due to incompatible classes after upgrading