CS Fixes and use of Normalizer instead of Serializer