Fix build
Fix serialization implementation