Fix some multi world issues