Improved handling of fleet/expo slots