Fix serialize and clone warnings