Excluded worlds and some fixes