more fixes for serializable