Improve handling for worlds not managed by MV-Core