Fixing "diamonds" warnings.
Fixing serializer resolution.