Fixed build errors based on custom-serialization commit.