Minor fixes.
Add serializer.