Fixes some missing Serializable interfaces