Listings Fixes