serilization fixes