Fix clone warnings/dup conf drops/restarts