Tiny updates to fix up for multiworld