Fix multi-world related bugs