Change $serializer visibility, and other fix