Fixes for serializers and extractors