Serealiization fixes;