Fix for Serialization related issues