Remove warnings for serialization