Clone world fixes [#57680908]