Improve handling of disabled worlds