Fix more bugs in serialization and Horse data.