Fix issues with world loading