A few fixes after the change in serialization library