Fixes to world reloading